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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 C67CAC2D0DB for ; Fri, 24 Jan 2020 14:28:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 937DD2075D for ; Fri, 24 Jan 2020 14:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876102; bh=tk6Byy/9gnS9TvzqixnbCarFVB/TnhObViSxEp0c7KE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a6xRb4jY0wY2Jm9unNsPVdzOz9KPBDkVzlk4bjhVeuehVJ7mB7Kd4aILWzd0c31do lfcEIS8wd0h2QcHgDzm2bECyNA7P8YIeOHoW2QtlXMl2s+4NYxF8hRIX7J/KZeMVRm hdF2vkIx6bTXywxCql1lCbzW54bCfJM61684PZY0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405231AbgAXOVL (ORCPT ); Fri, 24 Jan 2020 09:21:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:42658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405223AbgAXOVK (ORCPT ); Fri, 24 Jan 2020 09:21:10 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 635C721556; Fri, 24 Jan 2020 14:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875670; bh=tk6Byy/9gnS9TvzqixnbCarFVB/TnhObViSxEp0c7KE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BjraEXxyOKUvg1F+QBpe5KYK2k6DvJeIwEcrdfSjUYgHC5juywnGVYuQkjX22hXl0 vz3oN4nd3HQQIKvCPT6I9X1I+3XPJt3fNPy9mqITONzQlXQrX64jvCUw1wj28XrbYq C5itHxiFtOp2TcY9qhFE7iDW/IKyO2KNvJu7FNDI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Westphal , syzbot+76d0b80493ac881ff77b@syzkaller.appspotmail.com, Pablo Neira Ayuso , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 49/56] netfilter: nft_tunnel: fix null-attribute check Date: Fri, 24 Jan 2020 09:20:05 -0500 Message-Id: <20200124142012.29752-49-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142012.29752-1-sashal@kernel.org> References: <20200124142012.29752-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Florian Westphal [ Upstream commit 1c702bf902bd37349f6d91cd7f4b372b1e46d0ed ] else we get null deref when one of the attributes is missing, both must be non-null. Reported-by: syzbot+76d0b80493ac881ff77b@syzkaller.appspotmail.com Fixes: aaecfdb5c5dd8ba ("netfilter: nf_tables: match on tunnel metadata") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c index 3a15f219e4e7f..09441bbb0166f 100644 --- a/net/netfilter/nft_tunnel.c +++ b/net/netfilter/nft_tunnel.c @@ -56,7 +56,7 @@ static int nft_tunnel_get_init(const struct nft_ctx *ctx, struct nft_tunnel *priv = nft_expr_priv(expr); u32 len; - if (!tb[NFTA_TUNNEL_KEY] && + if (!tb[NFTA_TUNNEL_KEY] || !tb[NFTA_TUNNEL_DREG]) return -EINVAL; -- 2.20.1