* [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation failure
@ 2010-08-11 10:11 ` Julia Lawall
0 siblings, 0 replies; 4+ messages in thread
From: Julia Lawall @ 2010-08-11 10:11 UTC (permalink / raw)
To: Tyler Hicks, Dustin Kirkland, ecryptfs-devel, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
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/)
// <smpl>
@@
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;
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation failure
@ 2010-08-11 10:11 ` Julia Lawall
0 siblings, 0 replies; 4+ messages in thread
From: Julia Lawall @ 2010-08-11 10:11 UTC (permalink / raw)
To: Tyler Hicks, Dustin Kirkland, ecryptfs-devel, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
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/)
// <smpl>
@@
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;
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation failure
2010-08-11 10:11 ` Julia Lawall
@ 2010-08-12 14:38 ` Tyler Hicks
-1 siblings, 0 replies; 4+ messages in thread
From: Tyler Hicks @ 2010-08-12 14:38 UTC (permalink / raw)
To: Julia Lawall
Cc: Dustin Kirkland, ecryptfs-devel, linux-kernel, kernel-janitors
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 <julia@diku.dk> wrote:
> From: Julia Lawall <julia@diku.dk>
>
> 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/)
>
> // <smpl>
> @@
> 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;
> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> 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;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation
@ 2010-08-12 14:38 ` Tyler Hicks
0 siblings, 0 replies; 4+ messages in thread
From: Tyler Hicks @ 2010-08-12 14:38 UTC (permalink / raw)
To: Julia Lawall
Cc: Dustin Kirkland, ecryptfs-devel, linux-kernel, kernel-janitors
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 <julia@diku.dk> wrote:
> From: Julia Lawall <julia@diku.dk>
>
> 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/)
>
> // <smpl>
> @@
> 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;
> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> 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;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-08-12 14:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-11 10:11 [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation failure Julia Lawall
2010-08-11 10:11 ` Julia Lawall
2010-08-12 14:38 ` Tyler Hicks
2010-08-12 14:38 ` [PATCH 4/5] fs/ecryptfs: Return -ENOMEM on memory allocation Tyler Hicks
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.