Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2678390pxb; Mon, 19 Apr 2021 11:03:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybmITZJ06G7mlvqYaWEeQZHwuPTPCdVtVFDAH2gqQHFKIsXaYtcYYGBgkdfZ2WAhIQEGrM X-Received: by 2002:a17:906:c419:: with SMTP id u25mr23834969ejz.332.1618855417913; Mon, 19 Apr 2021 11:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618855417; cv=none; d=google.com; s=arc-20160816; b=Y5FOeUp2ewPCZQYU5mhbwS4SQSKI72DvpCDAU2oUCIk4yN5pj61NrtjacaqnKUfph3 13Ft8Sa5illKvKnObUi6Lfb1reLa5+lcwX7iWIwLGXerLYWJS/p59wW4Q3/SLZoM1KVZ QAJ7gFtS0qXZynZL9GwM+Ijmon0yiDFkayq2y1ze71tdLQR1FSGvR2bSJ7foOa1Dng/p numQvqGl6h2Dt9BbBgoqoGrOuwY84jzP+Hzr+kUUFIcrWsSTQsCUp8EmZ9eCojCAnDHg vlD8dWvRlkrOn/tdZDfYkYbOFkrkpaEwmTB2iIpRqwn24zh/tOKL9qMjNjrFRCBoLnEi +XHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o53BS3PNhGnll2Vk4lzA6Qra8zn3b4kAjFbC3hOVJS4=; b=hy07SuKfix34rqoM7DA8r8F4b0/QidodhKm+Jpkys8Eyj6UHvIs+BBjNPWrgvQZev2 WZP2/BX95kIi9cyUTgyPs0ebmDl4dX+X5CUQpDVDXne+IKwn5/rYRtteqDmH4gwOmR40 9W13v4ZMR+5foeU+jOU87fUYA15qPuvcOHBJRGktmWyA+BgQHCqSQs2eTkmxWyMVpEt+ hkmdth/+EGgMGmsxIIAft0AA+ks4W0HGDseTNXsMwGbRskDBw0bd5Zep3jyiYFzfOdxU WScbGC2exRd2XX7tM1xc45ts3ibmiOspILjDmNhhM/cqZ/eO0f6D4dGCshyjOwp+uPtw 5Zlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZJNWEo31; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m3si12608589edr.251.2021.04.19.11.02.51; Mon, 19 Apr 2021 11:03:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZJNWEo31; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241800AbhDSNho (ORCPT + 99 others); Mon, 19 Apr 2021 09:37:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:34012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242069AbhDSNZQ (ORCPT ); Mon, 19 Apr 2021 09:25:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 046E3613C6; Mon, 19 Apr 2021 13:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838427; bh=SPzFrNWbP0myf455MsY7S9A/Ct5XzJP/B1iAyiQPiEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJNWEo31scg+WqnR4+sI3xykJ+Aq87Hfy+gRXa18if7WTI5Wddwq4JEhoKiZfF1s/ boaaRSx0E0dIjsX6dQiZ/os8Qsx9uZpdUQbNFqd9j7yuo4gYdQhQUqMKucntPQusGK KbDVHu/cVKPF8samLud5LVWtPS3OyB0OplqRJxiA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , syzbot , Pablo Neira Ayuso , Luigi Rizzo Subject: [PATCH 5.4 55/73] netfilter: nft_limit: avoid possible divide error in nft_limit_init Date: Mon, 19 Apr 2021 15:06:46 +0200 Message-Id: <20210419130525.602091577@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130523.802169214@linuxfoundation.org> References: <20210419130523.802169214@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet commit b895bdf5d643b6feb7c60856326dd4feb6981560 upstream. div_u64() divides u64 by u32. nft_limit_init() wants to divide u64 by u64, use the appropriate math function (div64_u64) divide error: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 8390 Comm: syz-executor188 Not tainted 5.12.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:div_u64_rem include/linux/math64.h:28 [inline] RIP: 0010:div_u64 include/linux/math64.h:127 [inline] RIP: 0010:nft_limit_init+0x2a2/0x5e0 net/netfilter/nft_limit.c:85 Code: ef 4c 01 eb 41 0f 92 c7 48 89 de e8 38 a5 22 fa 4d 85 ff 0f 85 97 02 00 00 e8 ea 9e 22 fa 4c 0f af f3 45 89 ed 31 d2 4c 89 f0 <49> f7 f5 49 89 c6 e8 d3 9e 22 fa 48 8d 7d 48 48 b8 00 00 00 00 00 RSP: 0018:ffffc90009447198 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000200000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffff875152e6 RDI: 0000000000000003 RBP: ffff888020f80908 R08: 0000200000000000 R09: 0000000000000000 R10: ffffffff875152d8 R11: 0000000000000000 R12: ffffc90009447270 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 000000000097a300(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000200001c4 CR3: 0000000026a52000 CR4: 00000000001506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: nf_tables_newexpr net/netfilter/nf_tables_api.c:2675 [inline] nft_expr_init+0x145/0x2d0 net/netfilter/nf_tables_api.c:2713 nft_set_elem_expr_alloc+0x27/0x280 net/netfilter/nf_tables_api.c:5160 nf_tables_newset+0x1997/0x3150 net/netfilter/nf_tables_api.c:4321 nfnetlink_rcv_batch+0x85a/0x21b0 net/netfilter/nfnetlink.c:456 nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:580 [inline] nfnetlink_rcv+0x3af/0x420 net/netfilter/nfnetlink.c:598 netlink_unicast_kernel net/netlink/af_netlink.c:1312 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1338 netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1927 sock_sendmsg_nosec net/socket.c:654 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:674 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2350 ___sys_sendmsg+0xf3/0x170 net/socket.c:2404 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2433 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xae Fixes: c26844eda9d4 ("netfilter: nf_tables: Fix nft limit burst handling") Fixes: 3e0f64b7dd31 ("netfilter: nft_limit: fix packet ratelimiting") Signed-off-by: Eric Dumazet Diagnosed-by: Luigi Rizzo Reported-by: syzbot Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nft_limit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/netfilter/nft_limit.c +++ b/net/netfilter/nft_limit.c @@ -76,13 +76,13 @@ static int nft_limit_init(struct nft_lim return -EOVERFLOW; if (pkts) { - tokens = div_u64(limit->nsecs, limit->rate) * limit->burst; + tokens = div64_u64(limit->nsecs, limit->rate) * limit->burst; } else { /* The token bucket size limits the number of tokens can be * accumulated. tokens_max specifies the bucket size. * tokens_max = unit * (rate + burst) / rate. */ - tokens = div_u64(limit->nsecs * (limit->rate + limit->burst), + tokens = div64_u64(limit->nsecs * (limit->rate + limit->burst), limit->rate); }