From 4f59c171e638b25a38db2c56a41254f5a63eba0b Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Wed, 19 Oct 2016 17:53:52 +0200 Subject: [PATCH] Revert "Fix for enabling self-broadcast-signal subscription" This reverts commit 8ebcf6b29cbc2838841b4eb5875a59c70f187b68. Original fix is no longer needed - proper one has been applied to systemd, which now does not forward broadcasts to itself when kdbus is used. Reference: https://github.com/systemd/systemd/commit/0a069ce62de904ae9cbaf23d026ac380b02e50e4 core: harden cgroups-agent forwarding Author: David Herrmann Furthermore, never forward broadcasts we sent ourself. This might happen on kdbus, as we forward the message on the same bus we received it on, thus ending up in an endless loop. Change-Id: Ic81e519669603a839f863b931908e45c064501d8 Signed-off-by: Karol Lewandowski --- ipc/kdbus/bus.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ipc/kdbus/bus.c b/ipc/kdbus/bus.c index 485243cab579..a67f825bdeaf 100644 --- a/ipc/kdbus/bus.c +++ b/ipc/kdbus/bus.c @@ -263,9 +263,6 @@ void kdbus_bus_broadcast(struct kdbus_bus *bus, down_read(&bus->conn_rwlock); hash_for_each(bus->conn_hash, i, conn_dst, hentry) { - if ((conn_dst->id == staging->msg->src_id) && (current->tgid == 1)) - continue; - if (!kdbus_conn_is_ordinary(conn_dst)) continue; -- 2.34.1