From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tyler Hicks Date: Thu, 12 Aug 2010 14:38:17 +0000 Subject: Re: [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation Message-Id: <20100812143816.GA938@ecryptfs> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Julia Lawall Cc: Dustin Kirkland , ecryptfs-devel@lists.launchpad.net, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Thanks Julia - Applied to git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next Tyler On Wed Aug 11, 2010 at 12:11:41PM +0200, Julia Lawall wrote: > From: Julia Lawall > > In this code, 0 is returned on memory allocation failure, even though other > failures return -ENOMEM or other similar values. > > A simplified version of the semantic match that finds this problem is as > follows: (http://coccinelle.lip6.fr/) > > // > @@ > expression ret; > expression x,e1,e2,e3; > @@ > > ret = 0 > ... when != ret = e1 > *x = \(kmalloc\|kcalloc\|kzalloc\)(...) > ... when != ret = e2 > if (x = NULL) { ... when != ret = e3 > return ret; > } > // > > Signed-off-by: Julia Lawall > > --- > fs/ecryptfs/keystore.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c > index 89c5476..73811cf 100644 > --- a/fs/ecryptfs/keystore.c > +++ b/fs/ecryptfs/keystore.c > @@ -515,6 +515,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, > if (!s) { > printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc " > "[%zd] bytes of kernel memory\n", __func__, sizeof(*s)); > + rc = -ENOMEM; > goto out; > } > s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; > @@ -806,6 +807,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, > if (!s) { > printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc " > "[%zd] bytes of kernel memory\n", __func__, sizeof(*s)); > + rc = -ENOMEM; > goto out; > } > s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;