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 5FC4CECE58A for ; Tue, 1 Oct 2019 17:02:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D30A2086A for ; Tue, 1 Oct 2019 17:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569949345; bh=XUvMcZuHtDRI4BwWKfBCSDQZ3OMqlA23MkrdA8f8wb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y7W84DG2qqmMkVf0k6k/0O9muSSjfTPY5YmjkLbCP/TEdrfMhb+Uu/v5qsxcXjZ+u zLmG8SiDSd2k8ZKzQq3dD/Um6Hre8L39qlC9KAfZAFHil9BOF7f70gYBm4Ign0FGb+ MNabwgQILfNuP6THFAHzsyoDFk/Z/Fsd9zHZaM4g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729541AbfJAQkF (ORCPT ); Tue, 1 Oct 2019 12:40:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:51220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729530AbfJAQkE (ORCPT ); Tue, 1 Oct 2019 12:40:04 -0400 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 662CA21A4C; Tue, 1 Oct 2019 16:40:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948004; bh=XUvMcZuHtDRI4BwWKfBCSDQZ3OMqlA23MkrdA8f8wb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qmB4/mRsH6Li2xFef9YrMa70zcA1qjTe/GzBEkLnUvzdZwqv7EJ5jCA+XEkw2/aO+ 1zPlvPM5Je5xQ1uz3xXEMySMsM4+G39hWsrsIhAEyeyZJ4hvrG9wNihXSWYNKDaJCH 0VMKzn3l0XOpQ6Js+eQdRI+VdNUG0amSTqvPuBas= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cong Wang , syzbot+618aacd49e8c8b8486bd@syzkaller.appspotmail.com, Jamal Hadi Salim , David Ahern , Jiri Pirko , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 29/71] net_sched: add max len check for TCA_KIND Date: Tue, 1 Oct 2019 12:38:39 -0400 Message-Id: <20191001163922.14735-29-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001163922.14735-1-sashal@kernel.org> References: <20191001163922.14735-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Cong Wang [ Upstream commit 62794fc4fbf52f2209dc094ea255eaef760e7d01 ] The TCA_KIND attribute is of NLA_STRING which does not check the NUL char. KMSAN reported an uninit-value of TCA_KIND which is likely caused by the lack of NUL. Change it to NLA_NUL_STRING and add a max len too. Fixes: 8b4c3cdd9dd8 ("net: sched: Add policy validation for tc attributes") Reported-and-tested-by: syzbot+618aacd49e8c8b8486bd@syzkaller.appspotmail.com Cc: Jamal Hadi Salim Signed-off-by: Cong Wang Reviewed-by: David Ahern Acked-by: Jiri Pirko Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/sch_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 1047825d9f48d..81d58b2806122 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1390,7 +1390,8 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w) } const struct nla_policy rtm_tca_policy[TCA_MAX + 1] = { - [TCA_KIND] = { .type = NLA_STRING }, + [TCA_KIND] = { .type = NLA_NUL_STRING, + .len = IFNAMSIZ - 1 }, [TCA_RATE] = { .type = NLA_BINARY, .len = sizeof(struct tc_estimator) }, [TCA_STAB] = { .type = NLA_NESTED }, -- 2.20.1