From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753557AbbGBIbP (ORCPT ); Thu, 2 Jul 2015 04:31:15 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:35287 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759AbbGBI3I (ORCPT ); Thu, 2 Jul 2015 04:29:08 -0400 From: David Herrmann To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , daniel@zonque.org, tixxdz@opendz.org, David Herrmann Subject: [PATCH 2/6] kdbus: drop redundant KDBUS_MSG_MAX_ITEMS Date: Thu, 2 Jul 2015 10:28:30 +0200 Message-Id: <1435825714-3567-3-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1435825714-3567-1-git-send-email-dh.herrmann@gmail.com> References: <1435825714-3567-1-git-send-email-dh.herrmann@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We already limit the size of the message object, there's no reason to add an arbitrary additional limit on the number of items. We don't do this for other item-arrays, so lets stop restricting the messages in this way. Signed-off-by: David Herrmann --- ipc/kdbus/limits.h | 3 --- ipc/kdbus/message.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/ipc/kdbus/limits.h b/ipc/kdbus/limits.h index 6450f58..c54925a 100644 --- a/ipc/kdbus/limits.h +++ b/ipc/kdbus/limits.h @@ -19,9 +19,6 @@ /* maximum size of message header and items */ #define KDBUS_MSG_MAX_SIZE SZ_8K -/* maximum number of message items */ -#define KDBUS_MSG_MAX_ITEMS 128 - /* maximum number of memfd items per message */ #define KDBUS_MSG_MAX_MEMFD_ITEMS 16 diff --git a/ipc/kdbus/message.c b/ipc/kdbus/message.c index 066e816..c499014 100644 --- a/ipc/kdbus/message.c +++ b/ipc/kdbus/message.c @@ -263,9 +263,6 @@ static int kdbus_msg_scan_items(struct kdbus_kmsg *kmsg, size_t payload_size = KDBUS_ITEM_PAYLOAD_SIZE(item); struct iovec *iov = kmsg->iov + kmsg->iov_count; - if (++n > KDBUS_MSG_MAX_ITEMS) - return -E2BIG; - switch (item->type) { case KDBUS_ITEM_PAYLOAD_VEC: { struct kdbus_msg_data *d = res->data + res->data_count; -- 2.4.5