mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 03:32:12 +02:00
bdcc4c9909
(From OE-Core rev: 3a299d1610bf085790017569de090b0a41cf809b) Signed-off-by: Deepthi Hemraj <Deepthi.Hemraj@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
68 lines
1.7 KiB
Diff
68 lines
1.7 KiB
Diff
From: Alan Modra <amodra@gmail.com>
|
|
Date: Thu, 16 Jun 2022 23:43:38 +0000 (+0930)
|
|
Subject: PR29255, memory leak in make_tempdir
|
|
X-Git-Tag: binutils-2_39~236
|
|
X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d6e1d48c83b165c129cb0aa78905f7ca80a1f682
|
|
|
|
PR29255, memory leak in make_tempdir
|
|
|
|
PR 29255
|
|
* bucomm.c (make_tempdir, make_tempname): Free template on all
|
|
failure paths.
|
|
|
|
Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d6e1d48c83b165c129cb0aa78905f7ca80a1f682]
|
|
|
|
CVE: CVE-2022-47008
|
|
|
|
Signed-off-by: Deepthi Hemraj <Deepthi.Hemraj@windriver.com>
|
|
|
|
---
|
|
|
|
diff --git a/binutils/bucomm.c b/binutils/bucomm.c
|
|
index fdc2209df9c..4395cb9f7f5 100644
|
|
--- a/binutils/bucomm.c
|
|
+++ b/binutils/bucomm.c
|
|
@@ -537,8 +537,9 @@ make_tempname (const char *filename, int *ofd)
|
|
#else
|
|
tmpname = mktemp (tmpname);
|
|
if (tmpname == NULL)
|
|
- return NULL;
|
|
- fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600);
|
|
+ fd = -1;
|
|
+ else
|
|
+ fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600);
|
|
#endif
|
|
if (fd == -1)
|
|
{
|
|
@@ -556,22 +557,23 @@ char *
|
|
make_tempdir (const char *filename)
|
|
{
|
|
char *tmpname = template_in_dir (filename);
|
|
+ char *ret;
|
|
|
|
#ifdef HAVE_MKDTEMP
|
|
- return mkdtemp (tmpname);
|
|
+ ret = mkdtemp (tmpname);
|
|
#else
|
|
- tmpname = mktemp (tmpname);
|
|
- if (tmpname == NULL)
|
|
- return NULL;
|
|
+ ret = mktemp (tmpname);
|
|
#if defined (_WIN32) && !defined (__CYGWIN32__)
|
|
if (mkdir (tmpname) != 0)
|
|
- return NULL;
|
|
+ ret = NULL;
|
|
#else
|
|
if (mkdir (tmpname, 0700) != 0)
|
|
- return NULL;
|
|
+ ret = NULL;
|
|
#endif
|
|
- return tmpname;
|
|
#endif
|
|
+ if (ret == NULL)
|
|
+ free (tmpname);
|
|
+ return ret;
|
|
}
|
|
|
|
/* Parse a string into a VMA, with a fatal error if it can't be
|