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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 939EFC43331 for ; Wed, 1 Apr 2020 16:43:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BA8E20719 for ; Wed, 1 Apr 2020 16:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759393; bh=8c9L/V/NFaE7MJiSJqrGZJsOP7sIRux2YXMZXzY50dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vf+yzvNaJbiKReylgE+TuABh4lPXktFBtirnclJU3sFXscdV/R7U9FZ45Ee4idleJ Lsqn9ASAkjJjeFj7geRqoh9ZT87+TTmLo489bM8V6NcF80igJ7V8hrV2VSy2QNS+w7 emVakFJnsOWwvoCBhGEygXRrCSfKNphdyOq6Yw7c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389601AbgDAQnL (ORCPT ); Wed, 1 Apr 2020 12:43:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:43840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389591AbgDAQnH (ORCPT ); Wed, 1 Apr 2020 12:43:07 -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 9E2F1214D8; Wed, 1 Apr 2020 16:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759386; bh=8c9L/V/NFaE7MJiSJqrGZJsOP7sIRux2YXMZXzY50dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C88z90DkBt0TbktGs6ov66kBpN4Ddi1zvvjrN0a94xb2Glcw7uUSPukF1fAlhKkMw C1o7r7V91FOQaz+Yw8Oe+ax64mnmXA3PXNofR1nSJ7YJi8+UYEno49OhV4QzymwYdh WqNlFBs93wliEJnGDkKq6uy/FAnrp2mkJhAMGEVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jamal Hadi Salim , Jiri Pirko , Cong Wang , "David S. Miller" , syzbot+dcc34d54d68ef7d2d53d@syzkaller.appspotmail.com, syzbot+c72da7b9ed57cde6fca2@syzkaller.appspotmail.com Subject: [PATCH 4.14 063/148] net_sched: keep alloc_hash updated after hash allocation Date: Wed, 1 Apr 2020 18:17:35 +0200 Message-Id: <20200401161559.731808028@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@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: Cong Wang [ Upstream commit 0d1c3530e1bd38382edef72591b78e877e0edcd3 ] In commit 599be01ee567 ("net_sched: fix an OOB access in cls_tcindex") I moved cp->hash calculation before the first tcindex_alloc_perfect_hash(), but cp->alloc_hash is left untouched. This difference could lead to another out of bound access. cp->alloc_hash should always be the size allocated, we should update it after this tcindex_alloc_perfect_hash(). Reported-and-tested-by: syzbot+dcc34d54d68ef7d2d53d@syzkaller.appspotmail.com Reported-and-tested-by: syzbot+c72da7b9ed57cde6fca2@syzkaller.appspotmail.com Fixes: 599be01ee567 ("net_sched: fix an OOB access in cls_tcindex") Cc: Jamal Hadi Salim Cc: Jiri Pirko Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/cls_tcindex.c | 1 + 1 file changed, 1 insertion(+) --- a/net/sched/cls_tcindex.c +++ b/net/sched/cls_tcindex.c @@ -375,6 +375,7 @@ tcindex_set_parms(struct net *net, struc if (tcindex_alloc_perfect_hash(cp) < 0) goto errout; + cp->alloc_hash = cp->hash; for (i = 0; i < min(cp->hash, p->hash); i++) cp->perfect[i].res = p->perfect[i].res; balloc = 1;