Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756735Ab1BCUAc (ORCPT ); Thu, 3 Feb 2011 15:00:32 -0500 Received: from rcsinet10.oracle.com ([148.87.113.121]:41171 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754986Ab1BCUAb convert rfc822-to-8bit (ORCPT ); Thu, 3 Feb 2011 15:00:31 -0500 Subject: Re: [PATCH] Fix size argument to memset call in nfsacl_encode Mime-Version: 1.0 (Apple Message framework v1082) Content-Type: text/plain; charset=us-ascii From: Chuck Lever In-Reply-To: Date: Thu, 3 Feb 2011 15:00:11 -0500 Cc: Trond Myklebust , Milton Miller , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Brown , bfields@fieldses.org Content-Transfer-Encoding: 8BIT Message-Id: <705C97E5-E273-45AA-9714-2BF409DE1322@oracle.com> References: <1296761330.3015.22.camel@heimdal.trondhjem.org> To: Jesper Juhl X-Mailer: Apple Mail (2.1082) X-Source-IP: acsmt355.oracle.com [141.146.40.155] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090206.4D4B0951.010F:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2720 Lines: 79 On Feb 3, 2011, at 2:41 PM, Jesper Juhl wrote: > On Thu, 3 Feb 2011, Trond Myklebust wrote: > >> On Thu, 2011-02-03 at 20:15 +0100, Jesper Juhl wrote: >>> We want to give memset() the sizeof(struct posix_acl), not >>> sizeof(struct posix_acl *). >>> >>> Signed-off-by: Jesper Juhl >>> --- >>> nfsacl.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c >>> index 84c27d6..bc6d81b 100644 >>> --- a/fs/nfs_common/nfsacl.c >>> +++ b/fs/nfs_common/nfsacl.c >>> @@ -117,7 +117,7 @@ int nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode, >>> * invoked in contexts where a memory allocation failure is >>> * fatal. Fortunately this fake ACL is small enough to >>> * construct on the stack. */ >>> - memset(acl2, 0, sizeof(acl2)); >>> + memset(acl2, 0, sizeof(*acl2)); >>> posix_acl_init(acl2, 4); >>> >>> /* Insert entries in canonical order: other orders seem >> >> Ccing Milton Miller who also sent in the same patch. >> >> Neither patch is correct afaics. posix_acl_init() will clobber the above >> memset, and so the correct fix is just to get rid of it... >> > > posix_acl_init() sets a_refcount and a_count, but what about a_entries ... > no problem, nfsacl_encode() itself takes care of that post the > posix_acl_init() call.. it's all good. > > So ... > > > Remove pointless memset() in nfsacl_encode(). > > Thanks to Trond Myklebust for pointing out > that it is not needed since posix_acl_init() will set everything > regardless.. > > Signed-off-by: Jesper Juhl > --- > nfsacl.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c > index 84c27d6..ec0f277 100644 > --- a/fs/nfs_common/nfsacl.c > +++ b/fs/nfs_common/nfsacl.c > @@ -117,7 +117,6 @@ int nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode, > * invoked in contexts where a memory allocation failure is > * fatal. Fortunately this fake ACL is small enough to > * construct on the stack. */ > - memset(acl2, 0, sizeof(acl2)); > posix_acl_init(acl2, 4); > > /* Insert entries in canonical order: other orders seem If there is a guarantee that random data that potentially resides between the fields in that structure will never appear on the wire, then ACK. -- Chuck Lever chuck[dot]lever[at]oracle[dot]com -- 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/