Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759497AbbFBPtr (ORCPT ); Tue, 2 Jun 2015 11:49:47 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44030 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759189AbbFBPtd (ORCPT ); Tue, 2 Jun 2015 11:49:33 -0400 X-Sasl-enc: qWl3pl5TjbfL4RNfdq+KbVscR36IHFj6B5o5aYIN2sTf 1433260172 From: Sergei Zviagintsev To: Greg Kroah-Hartman , Daniel Mack , David Herrmann , Djalal Harouni Cc: linux-kernel@vger.kernel.org, Sergei Zviagintsev Subject: [PATCH] kdbus: kdbus_item_validate(): remove duplicated code Date: Tue, 2 Jun 2015 18:48:49 +0300 Message-Id: <1433260130-1604-3-git-send-email-sergei@s15v.net> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 987 Lines: 33 KDBUS_ITEM_PAYLOAD_VEC and KDBUS_ITEM_PAYLOAD_OFF cases use literally the same code, so merge them. Signed-off-by: Sergei Zviagintsev --- ipc/kdbus/item.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ipc/kdbus/item.c b/ipc/kdbus/item.c index 745ad5495096..1ee72c2ad7c3 100644 --- a/ipc/kdbus/item.c +++ b/ipc/kdbus/item.c @@ -96,12 +96,6 @@ int kdbus_item_validate(const struct kdbus_item *item) break; case KDBUS_ITEM_PAYLOAD_VEC: - if (payload_size != sizeof(struct kdbus_vec)) - return -EINVAL; - if (item->vec.size == 0 || item->vec.size > SIZE_MAX) - return -EINVAL; - break; - case KDBUS_ITEM_PAYLOAD_OFF: if (payload_size != sizeof(struct kdbus_vec)) return -EINVAL; -- 1.8.3.1 -- 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/