forked from pool/systemd
6a62c05e32
- Add upstream patches as real fixes 0001-activate-fix-fd-leak-in-do_accept.patch 0002-analyze-avoid-a-null-dereference.patch 0003-analyze-fix-mem-leak.patch 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch 0006-bus-unref-buscreds-on-failure.patch 0007-core-fix-a-potential-mem-leak.patch 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch 0009-journal-do-not-leak-mmaps-on-OOM.patch 0010-manager-use-correct-cleanup-function.patch - Intergrate the work of Robert and rename the patch 1068-udev-remove-userspace-firmware-loading-support.patch to 1078-udev-remove-userspace-firmware-loading-support.patch Also add patch 1079-udev-remove-userspace-firmware-loading-support.patch to apply the same change for opensuse 13.2 and above - Add upstream patch 0001-systemctl-allow-to-change-the-default-target-without.patch to allow to override default target without --force (bnc#896664) - Add upstream patches for udev 1068-udev-net_setup_link-export-the-.link-filename-applie.patch 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch 1070-rules-net-setup-link-remove-stray-linebreak.patch 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch 1072-udev-netif_rename-don-t-log-to-kmsg.patch 1073-udev-drop-print_kmsg.patch 1074-udev-fix-copy-paste-error-in-log-message.patch OBS-URL: https://build.opensuse.org/request/show/249581 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=206
51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
From b67ddc7bbe31cde7f69f9814204d9bb1d4623c47 Mon Sep 17 00:00:00 2001
|
|
From: Philippe De Swert <philippedeswert@gmail.com>
|
|
Date: Wed, 10 Sep 2014 12:20:41 +0300
|
|
Subject: [PATCH] journal: do not leak mmaps on OOM
|
|
|
|
After a section of memory is succesfully allocated, some of the following
|
|
actions can still fail due to lack of memory. In this case -ENOMEM is
|
|
returned without actually freeing the already mapped memory.
|
|
Found with coverity. Fixes: CID#1237762
|
|
---
|
|
src/journal/mmap-cache.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git src/journal/mmap-cache.c src/journal/mmap-cache.c
|
|
index 7dbbb5e..908562d 100644
|
|
--- src/journal/mmap-cache.c
|
|
+++ src/journal/mmap-cache.c
|
|
@@ -496,15 +496,15 @@ static int add_mmap(
|
|
|
|
c = context_add(m, context);
|
|
if (!c)
|
|
- return -ENOMEM;
|
|
+ goto outofmem;
|
|
|
|
f = fd_add(m, fd);
|
|
if (!f)
|
|
- return -ENOMEM;
|
|
+ goto outofmem;
|
|
|
|
w = window_add(m);
|
|
if (!w)
|
|
- return -ENOMEM;
|
|
+ goto outofmem;
|
|
|
|
w->keep_always = keep_always;
|
|
w->ptr = d;
|
|
@@ -522,6 +522,10 @@ static int add_mmap(
|
|
if (ret)
|
|
*ret = (uint8_t*) w->ptr + (offset - w->offset);
|
|
return 1;
|
|
+
|
|
+outofmem:
|
|
+ munmap(d, wsize);
|
|
+ return -ENOMEM;
|
|
}
|
|
|
|
int mmap_cache_get(
|
|
--
|
|
1.7.9.2
|
|
|