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
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
Based on fd989a0bc999d79719408ac28b126d9c9016bcb5 Mon Sep 17 00:00:00 2001
|
|
From: Philippe De Swert <philippedeswert@gmail.com>
|
|
Date: Wed, 10 Sep 2014 12:20:38 +0300
|
|
Subject: [PATCH] bus: avoid using m->kdbus after freeing it
|
|
|
|
m->kdbus could be freed before it is released. Changing the
|
|
order fixes the issue.
|
|
|
|
Found with Coverity. Fixes: CID#1237798
|
|
---
|
|
src/libsystemd/sd-bus/bus-message.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- src/libsystemd/sd-bus/bus-message.c
|
|
+++ src/libsystemd/sd-bus/bus-message.c 2014-09-16 10:31:37.538735664 +0000
|
|
@@ -126,9 +126,6 @@ static void message_free(sd_bus_message
|
|
|
|
message_reset_parts(m);
|
|
|
|
- if (m->free_kdbus)
|
|
- free(m->kdbus);
|
|
-
|
|
if (m->release_kdbus) {
|
|
uint64_t off;
|
|
|
|
@@ -136,6 +133,9 @@ static void message_free(sd_bus_message
|
|
ioctl(m->bus->input_fd, KDBUS_CMD_FREE, &off);
|
|
}
|
|
|
|
+ if (m->free_kdbus)
|
|
+ free(m->kdbus);
|
|
+
|
|
if (m->bus)
|
|
sd_bus_unref(m->bus);
|
|
|