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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 B38B3C04E53 for ; Wed, 15 May 2019 11:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8505E20843 for ; Wed, 15 May 2019 11:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919727; bh=2OasU5JmCB1n24w3mQY8vAviPP73G/mzqv6p+ILM9Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZPkpfRZrU926QFZfV2UyTOCH9K77m3107Hgo6UwCDMLhZ72cWb7joZPg0Un8gMTNi 91Jd+SWBIJgaMvX+wq8QMCbz8Z8mXg8vXLIK5sdLgqPLvihqpkSs3ORwZNfOeuE3Bw IF8KZXX89b7MH5knMtoPoibqBzNxTHNSbtyB2yx0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732005AbfEOL2p (ORCPT ); Wed, 15 May 2019 07:28:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:39856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732434AbfEOL2n (ORCPT ); Wed, 15 May 2019 07:28:43 -0400 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 8EEEF206BF; Wed, 15 May 2019 11:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919723; bh=2OasU5JmCB1n24w3mQY8vAviPP73G/mzqv6p+ILM9Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ky/JnRbO9i0kdkdGOuOWotIwB6VcRzBS3g/7gLC+fwMp2rDdmn/ZFkhKdrooUZOWK 8uOpH3pySzWO9pJTGoDJmw+Zh4M39sv+TiJJV2lyPqOYIza1OhM42UuDrC7Clyzo4w omjUr4Ls8evmpT20mKVzGOBe9pNgLhuXRMeUxjxs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.0 067/137] netfilter: nf_tables: prevent shift wrap in nft_chain_parse_hook() Date: Wed, 15 May 2019 12:55:48 +0200 Message-Id: <20190515090658.323236652@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090651.633556783@linuxfoundation.org> References: <20190515090651.633556783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 33d1c018179d0a30c39cc5f1682b77867282694b ] I believe that "hook->num" can be up to UINT_MAX. Shifting more than 31 bits would is undefined in C but in practice it would lead to shift wrapping. That would lead to an array overflow in nf_tables_addchain(): ops->hook = hook.type->hooks[ops->hooknum]; Fixes: fe19c04ca137 ("netfilter: nf_tables: remove nhooks field from struct nft_af_info") Signed-off-by: Dan Carpenter Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index e2aac80f9b7b1..25c2b98b9a960 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1502,7 +1502,7 @@ static int nft_chain_parse_hook(struct net *net, if (IS_ERR(type)) return PTR_ERR(type); } - if (!(type->hook_mask & (1 << hook->num))) + if (hook->num > NF_MAX_HOOKS || !(type->hook_mask & (1 << hook->num))) return -EOPNOTSUPP; if (type->type == NFT_CHAIN_T_NAT && -- 2.20.1