Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758797AbYBFRr3 (ORCPT ); Wed, 6 Feb 2008 12:47:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755381AbYBFRqc (ORCPT ); Wed, 6 Feb 2008 12:46:32 -0500 Received: from [198.99.130.12] ([198.99.130.12]:44529 "EHLO saraswathi.solana.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1757916AbYBFRqb (ORCPT ); Wed, 6 Feb 2008 12:46:31 -0500 Date: Wed, 6 Feb 2008 12:44:47 -0500 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel , Jim Meyering Subject: [PATCH 3/5] UML - Improved error handling while locating temp dir Message-ID: <20080206174447.GA7861@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1849 Lines: 63 From: Jim Meyering * arch/um/os-Linux/mem.c (make_tempfile): Don't deref NULL upon failed malloc. * arch/um/os-Linux/mem.c (make_tempfile): Handle NULL tempdir. Don't let a long tempdir (e.g., via TMPDIR) provoke heap corruption. [ jdike - formatting cleanups, deleted obsolete comment ] Signed-off-by: Jim Meyering Signed-off-by: Jeff Dike --- arch/um/os-Linux/mem.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) Index: linux-2.6-git/arch/um/os-Linux/mem.c =================================================================== --- linux-2.6-git.orig/arch/um/os-Linux/mem.c 2008-02-05 13:20:46.000000000 -0500 +++ linux-2.6-git/arch/um/os-Linux/mem.c 2008-02-05 16:37:37.000000000 -0500 @@ -162,11 +162,6 @@ found: goto out; } -/* - * This proc still used in tt-mode - * (file: kernel/tt/ptproxy/proxy.c, proc: start_debugger). - * So it isn't 'static' yet. - */ static int __init make_tempfile(const char *template, char **out_tempname, int do_unlink) { @@ -175,10 +170,13 @@ static int __init make_tempfile(const ch which_tmpdir(); tempname = malloc(MAXPATHLEN); - if (!tempname) - goto out; + if (tempname == NULL) + return -1; find_tempdir(); + if ((tempdir == NULL) || (strlen(tempdir) >= MAXPATHLEN)) + return -1; + if (template[0] != '/') strcpy(tempname, tempdir); else @@ -196,9 +194,8 @@ static int __init make_tempfile(const ch } if (out_tempname) { *out_tempname = tempname; - } else { + } else free(tempname); - } return fd; out: free(tempname); -- 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/