Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3315290pxb; Tue, 19 Jan 2021 21:13:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0r7W3EiqRg75MoXvnbe1f60dxNo1WmD22eH9/feCZHzzXtCBYD6uSWhYUG02woqpl2crC X-Received: by 2002:a50:b223:: with SMTP id o32mr5952306edd.79.1611119635395; Tue, 19 Jan 2021 21:13:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611119635; cv=none; d=google.com; s=arc-20160816; b=Q8suihsbJjzDrOuzxb0oEedJUgATrcPC+HhITgJC7jv/mVomgqmMgLZJt1xDj4Vbiw NK7BHxyOGreL17fdN/NY8VfE9yzAauufuLD7Ut0MMTiYcRs/cIPEcma32nSGBd79B540 iR1U1Y74zvtHQ2TSSEVy8dDkOB3hWqe9Jz+KCpnAJyLViAYDC1BAl29C7GVDiF8uu4X/ Nk1XRcBwBuw9Au42gnY6JgA4qEyd5JNgwGrupaLHUa3ytYh2Om+safqabNW1i+n5hlER 3rlLBLpUtRh/NIx/mGjBMXajYlgFzj3O2OLSLs7TWr4JaouRdeOeJrMB64t6B4dH34Nv gu+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:message-id:in-reply-to :subject:cc:to:from:date; bh=4KGWZ11pPdnv8jASKl3NR4tGhpctj6FEhqCId+HOwL8=; b=swXK6ysJ1EDv6Jj/y/AQHooV7Pz/LND4ANSSY+Sl7wiQzJv8ztj2n9KqEPrIpJfZ5k oM2lmkjDEG4FhwdQxCryCKNVKbzSEEZlNJaIPUhKCckdgEDmGKYioD4uEHyS3pu/2Vkn YfnCv0HhstPaFcEG4I/flgUvQkmH+oHqNclKzrrNZ4gCKvnzZ0VudlrVSEk7o45bPkr1 QnPWqwQso/Xb2OX5R0P8vJ6nkqeOVhZ96hU+n3XiM/6ivKrxyEHcXhzLCB1usFk2OeSh ehK7bzer+QX59TQkdYIloYhumlPyRXtXsZzagA9orh+WA+CgOIpSjnIVtqyjkTj7lSqA oDxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d13si107819ejj.426.2021.01.19.21.13.26; Tue, 19 Jan 2021 21:13:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729170AbhATFAP (ORCPT + 99 others); Wed, 20 Jan 2021 00:00:15 -0500 Received: from namei.org ([65.99.196.166]:50792 "EHLO mail.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729027AbhATE7p (ORCPT ); Tue, 19 Jan 2021 23:59:45 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.namei.org (Postfix) with ESMTPS id 6BA181BC; Wed, 20 Jan 2021 04:57:56 +0000 (UTC) Date: Wed, 20 Jan 2021 15:57:56 +1100 (AEDT) From: James Morris To: Ondrej Mosnacek cc: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker , linux-security-module@vger.kernel.org, selinux@vger.kernel.org, David Quigley Subject: Re: [PATCH] NFSv4.2: fix return value of _nfs4_get_security_label() In-Reply-To: <20210115174356.408688-1-omosnace@redhat.com> Message-ID: <2d85fd54-5c4d-391e-f01b-1537017aafa@namei.org> References: <20210115174356.408688-1-omosnace@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Fri, 15 Jan 2021, Ondrej Mosnacek wrote: > An xattr 'get' handler is expected to return the length of the value on > success, yet _nfs4_get_security_label() (and consequently also > nfs4_xattr_get_nfs4_label(), which is used as an xattr handler) returns > just 0 on success. > > Fix this by returning label.len instead, which contains the length of > the result. > > Fixes: aa9c2669626c ("NFS: Client implementation of Labeled-NFS") > Signed-off-by: Ondrej Mosnacek > --- > fs/nfs/nfs4proc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index 2f4679a62712a..28465d8aada64 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -5971,7 +5971,7 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, > return ret; > if (!(fattr.valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL)) > return -ENOENT; > - return 0; > + return label.len; > } Reviewed-by: James Morris -- James Morris