lkml.org 
[lkml]   [2005]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/19] setting ACLs on readonly mounted NFS filesystems (CVE-2005-3623)
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Andreas Gruenbacher <agruen@suse.de>

    We must check for MAY_SATTR before setting acls, which includes
    checking for read-only exports: the lower-level setxattr operation
    that eventually sets the acl cannot check export-level restrictions.

    Bug reported by Martin Walter <mawa@uni-freiburg.de>.

    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfsd/nfs2acl.c | 2 +-
    fs/nfsd/nfs3acl.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- linux-2.6.14.4.orig/fs/nfsd/nfs2acl.c
    +++ linux-2.6.14.4/fs/nfsd/nfs2acl.c
    @@ -107,7 +107,7 @@ static int nfsacld_proc_setacl(struct sv
    dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh));

    fh = fh_copy(&resp->fh, &argp->fh);
    - nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
    + nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR);

    if (!nfserr) {
    nfserr = nfserrno( nfsd_set_posix_acl(
    --- linux-2.6.14.4.orig/fs/nfsd/nfs3acl.c
    +++ linux-2.6.14.4/fs/nfsd/nfs3acl.c
    @@ -101,7 +101,7 @@ static int nfsd3_proc_setacl(struct svc_
    int nfserr = 0;

    fh = fh_copy(&resp->fh, &argp->fh);
    - nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
    + nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR);

    if (!nfserr) {
    nfserr = nfserrno( nfsd_set_posix_acl(
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-12-23 23:52    [W:0.022 / U:29.504 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site