From patchwork Fri Jan 24 09:30:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233175 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 A387DC35242 for ; Fri, 24 Jan 2020 09:58:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73BBA222C2 for ; Fri, 24 Jan 2020 09:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859882; bh=uyQz7Tfs0p/GGVk/NprOdouUAS5S+mA2PqB4pXjYdtU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P6Pf4KvoKGSZJHBPZ27j2CtkCWrkUVX+HUkczSQXhvXpFoVIskYbn1TciJbJrLtDg um3rda7MqdQOWvOhA/bXo1AOiP9r6fEmhGXeI9ChXO78LMAdnb90KbxHOB3+thHUvn uGGYRc4a9tOFdYd7KSWARZ2PCeW00sHrCop0ph4I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729990AbgAXJ6B (ORCPT ); Fri, 24 Jan 2020 04:58:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:33628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388631AbgAXJ6B (ORCPT ); Fri, 24 Jan 2020 04:58:01 -0500 Received: from localhost (unknown [145.15.244.15]) (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 08A7920709; Fri, 24 Jan 2020 09:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859880; bh=uyQz7Tfs0p/GGVk/NprOdouUAS5S+mA2PqB4pXjYdtU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YOgB6+8U5aESjTZLygpZjgz1UXTpnTxqtu20qaMMaWycQDASHEO30A9jx+gIrLRWt poavngmM2bOpeA88C0kNSZnUWwOMYz9ScktLoj7wUhIdhInauBBECR8Q+NmCZgIqgL ZzzujcqN/ra03hi2ZSZT67ZK1++LFM/AwUt7xBoI= 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.14 203/343] netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule Date: Fri, 24 Jan 2020 10:30:21 +0100 Message-Id: <20200124092946.701793857@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 35a670ec90775..a1834ad7422ce 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -2164,7 +2164,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; }