All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
	user-mode-linux-devel@lists.sourceforge.net,
	Vitaliy Ivanov <vitalivanov@gmail.com>,
	Richard Weinberger <richard@nod.at>
Subject: [PATCH 03/10] uml: drivers/slip_user.c memory leak fix
Date: Thu, 21 Jul 2011 11:18:27 +0200	[thread overview]
Message-ID: <1311239914-8301-3-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1311239914-8301-1-git-send-email-richard@nod.at>

From: Vitaliy Ivanov <vitalivanov@gmail.com>

Do not free memory when you failed to allocate it.

Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/um/drivers/slip_user.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index a1c2d2c..cbacfc4 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -102,7 +102,7 @@ static int slip_tramp(char **argv, int fd)
 		       "buffer\n");
 		os_kill_process(pid, 1);
 		err = -ENOMEM;
-		goto out_free;
+		goto out_close;
 	}
 
 	close(fds[1]);
@@ -112,7 +112,6 @@ static int slip_tramp(char **argv, int fd)
 	err = helper_wait(pid);
 	close(fds[0]);
 
-out_free:
 	kfree(output);
 	return err;
 
-- 
1.7.6


WARNING: multiple messages have this Message-ID (diff)
From: Richard Weinberger <richard@nod.at>
To: akpm@linux-foundation.org
Cc: Richard Weinberger <richard@nod.at>,
	Vitaliy Ivanov <vitalivanov@gmail.com>,
	linux-kernel@vger.kernel.org,
	user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] [PATCH 03/10] uml: drivers/slip_user.c memory leak fix
Date: Thu, 21 Jul 2011 11:18:27 +0200	[thread overview]
Message-ID: <1311239914-8301-3-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1311239914-8301-1-git-send-email-richard@nod.at>

From: Vitaliy Ivanov <vitalivanov@gmail.com>

Do not free memory when you failed to allocate it.

Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/um/drivers/slip_user.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index a1c2d2c..cbacfc4 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -102,7 +102,7 @@ static int slip_tramp(char **argv, int fd)
 		       "buffer\n");
 		os_kill_process(pid, 1);
 		err = -ENOMEM;
-		goto out_free;
+		goto out_close;
 	}
 
 	close(fds[1]);
@@ -112,7 +112,6 @@ static int slip_tramp(char **argv, int fd)
 	err = helper_wait(pid);
 	close(fds[0]);
 
-out_free:
 	kfree(output);
 	return err;
 
-- 
1.7.6


------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can 
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


  parent reply	other threads:[~2011-07-21  9:19 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-21  9:18 [PATCH 01/10] uml: cow_user.c warning corrections Richard Weinberger
2011-07-21  9:18 ` [uml-devel] " Richard Weinberger
2011-07-21  9:18 ` [PATCH 02/10] uml: helper.c " Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger
2011-07-21  9:18 ` Richard Weinberger [this message]
2011-07-21  9:18   ` [uml-devel] [PATCH 03/10] uml: drivers/slip_user.c memory leak fix Richard Weinberger
2011-07-21  9:18 ` [PATCH 04/10] uml: free resources Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger
2011-07-21  9:18 ` [PATCH 05/10] um: Disable scan_elf_aux() on x86_64 Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger
2011-07-21  9:18 ` [PATCH 06/10] um: Set __HAVE_ARCH_GATE_AREA for i386 Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger
2011-07-21  9:18 ` [PATCH 07/10] um: Set __HAVE_ARCH_GATE_AREA for x86_64 Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger
2011-07-22 23:01   ` Andrew Morton
2011-07-23 12:15     ` Richard Weinberger
2011-07-23 12:15       ` [uml-devel] " Richard Weinberger
2011-07-21  9:18 ` [PATCH 08/10] um: Implement a x86_64 vDSO Richard Weinberger
2011-07-21  9:18 ` [PATCH 09/10] um: Ajdust size of pid_buf Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger
2011-07-21  9:38   ` Geert Uytterhoeven
2011-07-21  9:48     ` Richard Weinberger
2011-07-21  9:18 ` [PATCH 10/10] um: Remove dead code Richard Weinberger
2011-07-21  9:18   ` [uml-devel] " Richard Weinberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311239914-8301-3-git-send-email-richard@nod.at \
    --to=richard@nod.at \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    --cc=vitalivanov@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.