Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2402375lqp; Sun, 24 Mar 2024 18:01:32 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVUa6mtwn+BLOmEhPP4mwDFh6wy+rnWw+qdk+PBFC4PzR0fWa0GRNRSdmBoV1nj5wO1SPRCQDkxtCIR+AyK6FMdyTWjuw4PEW/4fDAGOg== X-Google-Smtp-Source: AGHT+IHTCG5A90kCkKJdmtvI0+nqH0dQMDmaDqqmmLhFKtUQ1sj9YG7P8OW7x0IyfP5KZsowc2Mr X-Received: by 2002:a17:902:f792:b0:1e0:bc8a:4d5f with SMTP id q18-20020a170902f79200b001e0bc8a4d5fmr1873521pln.11.1711328492149; Sun, 24 Mar 2024 18:01:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711328492; cv=pass; d=google.com; s=arc-20160816; b=sEwBAMEXvZ66S5aOAt2/6y2KTZrJUAzcHqFxdcOvWm7hU296C4+Jb4MnyDkNZOng2y Z64au45i9PniQPYfqHQ866kUidKZNQ5DIQz3nWjqunpZu8CxYIhOPe6/UsO7idrMgU9R 39KPPJenGLypcyWjHVB3L+ZopUcNdjYS+03kyzHufOVaBIllfq/Hy/5pTAQAOy28Tt7R oiurVI4JmPwiPhOLVwcCGNCABTQqZ4F8ZwjVKlBPFf26djAypYv82px5bKW2YiKBkHbl rsAP3rMVioTCqTVhW+akw5PZKTQPpiSjqw5ILO4z/FIKqhrQS7qykj3HMgxnr0Lfpqw9 Ak1g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tFZro3zopkdG1dG9xvb6nwaXYG80RDdW8tnAyF4xUSU=; fh=k4i4HMTX/VtFiREUzdKP+h8OJRcgU0U3dVVdh3vY2BY=; b=J05Eah3VrdlZzSJ52AhCJMQbBHezVHzbsCb7cTZRZ+cEyARR9QLZy70GK0j3YKO/vD qdl+geKNgHQoqfLlhCwnZqjtFCnItokl9TLpGxyGpKrVpHPD7FhMTr+8JJgSDb7ivUA8 OT/SgeDtXZA0y8HtDjTQKE73UoMyvQ1ZLrovmphBB82gsOnC1tvg4h+JP+bMToo4dWMl wVZNa4ZeJuPo23Aaa0nSKvsSGMZmaNCHRANM9u3Xs5ayu5JUweGgaV2tEoXo42Kt0bvb ARk8nBUZDFnPI6I2Smz99Qlug8Bh4i9nZg9E9S6fpZefLKUG78r9W2XBk+REZzUQUBwm i+Kg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AXGGs+2u; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113539-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113539-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 11-20020a170902c14b00b001e039a37289si4048228plj.613.2024.03.24.18.01.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 18:01:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113539-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AXGGs+2u; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113539-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113539-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E9878286246 for ; Mon, 25 Mar 2024 00:59:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59E901C1BE3; Sun, 24 Mar 2024 22:45:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AXGGs+2u" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40DC91C1322; Sun, 24 Mar 2024 22:45:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320341; cv=none; b=VY6lNZDHXhpX/GrtKwy8uF5h/Q2HZaqH59CKJjRfaQ3LWz9eDh4CVyQwCHJgRZpRtSbGfh1ZhBWoDHuDQ7ORBYs5xpz4u2vnBJ2u0P94RkLTqTnFycTOePLstwKjD9BFIjdog0uLDrRieuW2VareYHGSEISf5rg/PIlofU3u8iQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320341; c=relaxed/simple; bh=NLXg1mMIeDthRs3gevp71oajPJK8l3xOG32jfOjQjjM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RcoCwcnKtxGYIIdShFAoCav3IEjOQc9aiopwchsFbQexjKshbZ6bUb/Dnisq2n9tvC80oP1Uw8/BfIVRr/zqcxf+DGK/YFZRAUuJxuAFkAKe4YaMNKkt0TwVCqDPuXZnapxJkAMXMSOtZjiBjIkkh3MwIMnHZ3JsDWdtJrwqetY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AXGGs+2u; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E65E1C433F1; Sun, 24 Mar 2024 22:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320340; bh=NLXg1mMIeDthRs3gevp71oajPJK8l3xOG32jfOjQjjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AXGGs+2uCustfQxPvmRgvBvSl5zZoxI6qWQ3yQBUhruMJy/NrSeY3a/uamFxtxZwG y3l3xHQQ+zudHOGGycnpnlT9EcByHClezsvPcGQbymrkNjZ+VL2zYuaQ/wpbBZqiBE vDQ+FkQeNYiuY+BrromI0kwPL4rvrgR4Jlo9czwX/gD1hYDfsKshXfwGkyq66VpdHF w52YIOv/CAM8IW8Zn1ya2tXHFEWGacavtdw4v7q8BPLeXjqSXIj1rNOvqIFtrwYuhl /hwpwAEH73xU/NFigBSX9o4WZjOPR3J1qc1quypAe3kBd5fpVPKYMe56OrZfAuPvn4 cCYX9YhkuhP+w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , syzbot+a340daa06412d6028918@syzkaller.appspotmail.com, Vladimir Oltean , Michal Kubiak , "David S . Miller" , Sasha Levin Subject: [PATCH 6.8 648/715] net/sched: taprio: proper TCA_TAPRIO_TC_ENTRY_INDEX check Date: Sun, 24 Mar 2024 18:33:47 -0400 Message-ID: <20240324223455.1342824-649-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Eric Dumazet [ Upstream commit 343041b59b7810f9cdca371f445dd43b35c740b1 ] taprio_parse_tc_entry() is not correctly checking TCA_TAPRIO_TC_ENTRY_INDEX attribute: int tc; // Signed value tc = nla_get_u32(tb[TCA_TAPRIO_TC_ENTRY_INDEX]); if (tc >= TC_QOPT_MAX_QUEUE) { NL_SET_ERR_MSG_MOD(extack, "TC entry index out of range"); return -ERANGE; } syzbot reported that it could fed arbitary negative values: UBSAN: shift-out-of-bounds in net/sched/sch_taprio.c:1722:18 shift exponent -2147418108 is negative CPU: 0 PID: 5066 Comm: syz-executor367 Not tainted 6.8.0-rc7-syzkaller-00136-gc8a5c731fd12 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/29/2024 Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1e7/0x2e0 lib/dump_stack.c:106 ubsan_epilogue lib/ubsan.c:217 [inline] __ubsan_handle_shift_out_of_bounds+0x3c7/0x420 lib/ubsan.c:386 taprio_parse_tc_entry net/sched/sch_taprio.c:1722 [inline] taprio_parse_tc_entries net/sched/sch_taprio.c:1768 [inline] taprio_change+0xb87/0x57d0 net/sched/sch_taprio.c:1877 taprio_init+0x9da/0xc80 net/sched/sch_taprio.c:2134 qdisc_create+0x9d4/0x1190 net/sched/sch_api.c:1355 tc_modify_qdisc+0xa26/0x1e40 net/sched/sch_api.c:1776 rtnetlink_rcv_msg+0x885/0x1040 net/core/rtnetlink.c:6617 netlink_rcv_skb+0x1e3/0x430 net/netlink/af_netlink.c:2543 netlink_unicast_kernel net/netlink/af_netlink.c:1341 [inline] netlink_unicast+0x7ea/0x980 net/netlink/af_netlink.c:1367 netlink_sendmsg+0xa3b/0xd70 net/netlink/af_netlink.c:1908 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0x221/0x270 net/socket.c:745 ____sys_sendmsg+0x525/0x7d0 net/socket.c:2584 ___sys_sendmsg net/socket.c:2638 [inline] __sys_sendmsg+0x2b0/0x3a0 net/socket.c:2667 do_syscall_64+0xf9/0x240 entry_SYSCALL_64_after_hwframe+0x6f/0x77 RIP: 0033:0x7f1b2dea3759 Code: 48 83 c4 28 c3 e8 d7 19 00 00 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffd4de452f8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f1b2def0390 RCX: 00007f1b2dea3759 RDX: 0000000000000000 RSI: 00000000200007c0 RDI: 0000000000000004 RBP: 0000000000000003 R08: 0000555500000000 R09: 0000555500000000 R10: 0000555500000000 R11: 0000000000000246 R12: 00007ffd4de45340 R13: 00007ffd4de45310 R14: 0000000000000001 R15: 00007ffd4de45340 Fixes: a54fc09e4cba ("net/sched: taprio: allow user input of per-tc max SDU") Reported-and-tested-by: syzbot+a340daa06412d6028918@syzkaller.appspotmail.com Signed-off-by: Eric Dumazet Cc: Vladimir Oltean Reviewed-by: Michal Kubiak Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sched/sch_taprio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index 31a8252bd09c9..ad99409c6325e 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -1008,7 +1008,8 @@ static const struct nla_policy entry_policy[TCA_TAPRIO_SCHED_ENTRY_MAX + 1] = { }; static const struct nla_policy taprio_tc_policy[TCA_TAPRIO_TC_ENTRY_MAX + 1] = { - [TCA_TAPRIO_TC_ENTRY_INDEX] = { .type = NLA_U32 }, + [TCA_TAPRIO_TC_ENTRY_INDEX] = NLA_POLICY_MAX(NLA_U32, + TC_QOPT_MAX_QUEUE), [TCA_TAPRIO_TC_ENTRY_MAX_SDU] = { .type = NLA_U32 }, [TCA_TAPRIO_TC_ENTRY_FP] = NLA_POLICY_RANGE(NLA_U32, TC_FP_EXPRESS, -- 2.43.0