From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA9E6C2D0DB for ; Tue, 28 Jan 2020 14:10:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D9CD24694 for ; Tue, 28 Jan 2020 14:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220649; bh=l07XCe/oxXK/c04wZGvYfw/u7E6/X9kNKUUESywN4cM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZTX8rP6TCOkUxk/ZVK4k94mvZwyU2j0dTvulTU5ZGGkgZEbs57nJ0d15K6f49S91A iq/56BxiKMfkFch7Hvnhu2QqF12DM9znxqCQprQuuNPgFHvGkbNjUQfiIhNvWKX3et 86Gu33gv+G6rvCO2lIKUi37+S7tzhsoQo3RVEWOc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728216AbgA1OKs (ORCPT ); Tue, 28 Jan 2020 09:10:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:59658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbgA1OKo (ORCPT ); Tue, 28 Jan 2020 09:10:44 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EBBAE22522; Tue, 28 Jan 2020 14:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220644; bh=l07XCe/oxXK/c04wZGvYfw/u7E6/X9kNKUUESywN4cM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZS3DC5zqxVdXFcgZQg0T55rxyriBannjpPnje/OshFB50xc6/os/EDhS++97D4x3 Oax8RbLEgEZx8/HBlUwveIABdGO7FEBKqx3Rz6rjn1wqLgqrFyr64x7/SRWsRrqMSV FDTMUxonDj8mi6ufXtFzYZtSAE0IFYFjinHk9AOA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.4 090/183] netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule Date: Tue, 28 Jan 2020 15:05:09 +0100 Message-Id: <20200128135839.103845982@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Westphal [ Upstream commit 680f6af5337c98d116e4f127cea7845339dba8da ] If userspace provides a rule blob with trailing data after last target, we trigger a splat, then convert ruleset to 64bit format (with trailing data), then pass that to do_replace_finish() which then returns -EINVAL. Erroring out right away avoids the splat plus unneeded translation and error unwind. Fixes: 81e675c227ec ("netfilter: ebtables: add CONFIG_COMPAT support") Reported-by: Tetsuo Handa Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index fd1af7cb960d5..e7c170949b210 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -2174,7 +2174,9 @@ static int compat_copy_entries(unsigned char *data, unsigned int size_user, if (ret < 0) return ret; - WARN_ON(size_remaining); + if (size_remaining) + return -EINVAL; + return state->buf_kern_offset; } -- 2.20.1