Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754136AbbDNIZ2 (ORCPT ); Tue, 14 Apr 2015 04:25:28 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:14891 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbbDNIZN (ORCPT ); Tue, 14 Apr 2015 04:25:13 -0400 X-AuditID: cbfee61b-f79536d000000f1f-e8-552ccee57d35 From: Lukasz Skalski To: gregkh@linuxfoundation.org, daniel@zonque.org, dh.herrmann@gmail.com, tixxdz@opendz.org Cc: sergei@s15v.net, linux-kernel@vger.kernel.org, Lukasz Skalski Subject: [PATCH v2] kdbus: do not append the same connection to the queue twice Date: Tue, 14 Apr 2015 10:24:53 +0200 Message-id: <1428999893-6062-1-git-send-email-l.skalski@samsung.com> X-Mailer: git-send-email 1.9.3 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplluLIzCtJLcpLzFFi42I5/e+xgO7TczqhBm+2yVs0/X3FYjGv9SiL RfPi9WwWc841Mllc3jWHzeLGqXmMFit/b2dzYPfYOesuu8f+uWvYPVb8OsLu8aTlGLtH35ZV jB6fN8l5bN+9nCWAPYrLJiU1J7MstUjfLoEro+/1fOaCZ5wV1ybpNjCeZ+9i5OSQEDCR6Jq1 FsoWk7hwbz1bFyMXh5DAIkaJmVs+sUI4PxklPqzczQJSxSagI/Hk5H0mEFtEIFZix/0ORhCb WSBaYtOPG2CThAX8JY78eMYGYrMIqEpMu/ocrJdXwEXifMtpRohtchK9294wT2DkXsDIsIpR NLUguaA4KT3XSK84Mbe4NC9dLzk/dxMjOHCeSe9gXNVgcYhRgINRiYf3hI9OqBBrYllxZe4h RgkOZiUR3qDDQCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8c3TlQoUE0hNLUrNTUwtSi2CyTByc Ug2MbQW9R1YLb30vefr4opzvch9khL5rR4TsXrDs4YNfiib++9fPnPFSagrLsZsHNh+5N2OD 1uwo5SV/rpg2XE9P9LALeWmrIyx384vldSEu8e4vR4/yC834Oc0/2DzQsuX4avW7+YXFHrLd HYn3Xbv311pcWfi891VNlrmsgPJ16VOTtQ6GL+H5r8RSnJFoqMVcVJwIAIoEnO8YAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1456 Lines: 48 As it was discussed on systemd ML [1], the same connection should be queued up only once for a given well-known name. [1] http://lists.freedesktop.org/archives/systemd-devel/2015-April/030494.html Signed-off-by: Lukasz Skalski diff --git a/ipc/kdbus/names.c b/ipc/kdbus/names.c index 657008e..df99e4d 100644 --- a/ipc/kdbus/names.c +++ b/ipc/kdbus/names.c @@ -353,10 +353,24 @@ int kdbus_name_acquire(struct kdbus_name_registry *reg, } else if (flags & KDBUS_NAME_QUEUE) { /* add to waiting-queue of the name */ - ret = kdbus_name_pending_new(e, conn, flags); - if (ret >= 0) - /* tell the caller that we queued it */ - rflags |= KDBUS_NAME_IN_QUEUE; + struct kdbus_name_pending *p; + bool in_queue = false; + + list_for_each_entry(p, &e->queue, name_entry) { + if (p->conn == conn) { + /* connection is already queued */ + rflags |= KDBUS_NAME_IN_QUEUE; + in_queue = true; + break; + } + } + + if (!in_queue) { + ret = kdbus_name_pending_new(e, conn, flags); + if (ret >= 0) + /* tell the caller that we queued it */ + rflags |= KDBUS_NAME_IN_QUEUE; + } } else { /* the name is busy, return a failure */ ret = -EEXIST; -- 1.9.3 -- 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/