Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756617AbYLEJjz (ORCPT ); Fri, 5 Dec 2008 04:39:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751672AbYLEJjn (ORCPT ); Fri, 5 Dec 2008 04:39:43 -0500 Received: from tundra.namei.org ([65.99.196.166]:58073 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbYLEJjl (ORCPT ); Fri, 5 Dec 2008 04:39:41 -0500 Date: Fri, 5 Dec 2008 20:39:13 +1100 (EST) From: James Morris To: "David P. Quigley" cc: hch@infradead.org, viro@zeniv.linux.org.uk, casey@schaufler-ca.com, sds@tycho.nsa.gov, "Matthew N. Dodd" , trond.myklebust@fys.uio.no, bfields@fieldses.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, labeled-nfs@linux-nfs.org Subject: Re: [PATCH 12/14] NFS: Client implementation of Labeled-NFS In-Reply-To: <1227733394-1114-13-git-send-email-dpquigl@tycho.nsa.gov> Message-ID: References: <1227733394-1114-1-git-send-email-dpquigl@tycho.nsa.gov> <1227733394-1114-13-git-send-email-dpquigl@tycho.nsa.gov> User-Agent: Alpine 1.10 (LRH 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1866 Lines: 72 On Wed, 26 Nov 2008, David P. Quigley wrote: > +#ifdef CONFIG_NFS_V4_SECURITY_LABEL > + if (((nd->flags & LOOKUP_CREATE) != 0) && > + nfs_server_capable(dir, NFS_CAP_SECURITY_LABEL)) { > + status = security_dentry_init_security(dentry, > + sattr->ia_mode, &l.label, &l.len); > + /* XXX: should this be more fatal? */ > + if (status == 0) > + label = &l; > + } > +#endif Per the comment, it seems this function should fail and propagate an error if status != 0. > + memset(&fattr, 0, sizeof(struct nfs_fattr)); > + nfs_fattr_alloc(&fattr, GFP_KERNEL); Need to check the return value. > + nfs_fattr_alloc(&fattr, GFP_KERNEL); Ditto. > +static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, void **ctx, __u32 *ctxlen) > +{ > + __u32 len; > + __be32 *p; > + int rc = 0; > + > + if (unlikely(bitmap[1] & (FATTR4_WORD1_SECURITY_LABEL - 1U))) > + return -EIO; > + if (likely(bitmap[1] & FATTR4_WORD1_SECURITY_LABEL)) { > + READ_BUF(4); > + READ32(len); > + READ_BUF(len); > + if (len < XDR_MAX_NETOBJ) { > + if (*ctx != NULL) { > + if (*ctxlen < len) { > + printk(KERN_ERR > + "%s(): ctxlen %d < len %d\n", > + __func__, *ctxlen, len); > + /* rc = -ENOMEM; */ > + *ctx = NULL; /* leak */ Shouldn't the function stop processing and return an error? > + } else { > + memcpy(*ctx, p, len); > + } > + } > + *ctxlen = len; > + } else > + printk(KERN_WARNING "%s: label too long (%u)!\n", > + __FUNCTION__, len); > + bitmap[1] &= ~FATTR4_WORD1_SECURITY_LABEL; > + } > + return rc; > +} > + -- James Morris -- 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/