* [merged] binfmt_flat-delete-two-error-messages-for-a-failed-memory-allocation-in-decompress_exec.patch removed from -mm tree
@ 2017-09-11 19:42 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2017-09-11 19:42 UTC (permalink / raw)
To: elfring, mm-commits
The patch titled
Subject: binfmt_flat: delete two error messages for a failed memory allocation in decompress_exec()
has been removed from the -mm tree. Its filename was
binfmt_flat-delete-two-error-messages-for-a-failed-memory-allocation-in-decompress_exec.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Markus Elfring <elfring@users.sourceforge.net>
Subject: binfmt_flat: delete two error messages for a failed memory allocation in decompress_exec()
Omit extra messages for a memory allocation failure in this function.
This issue was detected by using the Coccinelle software.
Link: http://lkml.kernel.org/r/f92aac79-b05e-321a-1a19-d38c7159ee9c@users.sourceforge.net
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/binfmt_flat.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff -puN fs/binfmt_flat.c~binfmt_flat-delete-two-error-messages-for-a-failed-memory-allocation-in-decompress_exec fs/binfmt_flat.c
--- a/fs/binfmt_flat.c~binfmt_flat-delete-two-error-messages-for-a-failed-memory-allocation-in-decompress_exec
+++ a/fs/binfmt_flat.c
@@ -192,13 +192,11 @@ static int decompress_exec(
memset(&strm, 0, sizeof(strm));
strm.workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
- if (strm.workspace == NULL) {
- pr_debug("no memory for decompress workspace\n");
+ if (!strm.workspace)
return -ENOMEM;
- }
+
buf = kmalloc(LBUFSIZE, GFP_KERNEL);
- if (buf == NULL) {
- pr_debug("no memory for read buffer\n");
+ if (!buf) {
retval = -ENOMEM;
goto out_free;
}
_
Patches currently in -mm which might be from elfring@users.sourceforge.net are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-09-11 19:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-11 19:42 [merged] binfmt_flat-delete-two-error-messages-for-a-failed-memory-allocation-in-decompress_exec.patch removed from -mm tree akpm
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.