Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2257717ybg; Sun, 27 Oct 2019 14:33:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzfh82PTLh/9+7mXCpT3OQeXKpO8jLpclTe6K6cgtDNbhvVZdoTV97EkufNfbmPfRxdQCUY X-Received: by 2002:a17:906:5807:: with SMTP id m7mr3248178ejq.58.1572212016046; Sun, 27 Oct 2019 14:33:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212016; cv=none; d=google.com; s=arc-20160816; b=aHBfcTr2TOU8Qpwz1N6ZABNsqQ1aCY+SNvhIiAM84GBBnauPKRfx/M54xi1ozzSm+4 V1o3lGTs6Oh9qvbWtsCuQCATSzgSiKOVrV7dYht/auFxJ+p6WCMoXRPYWWJFvpkBR5JN X/ABqKMbsxq+P7h2gpqvAZU8/1BuhpNuQkdUMgSJagpfV/Ya+sCpSquVi/K69b81mIWd H7evsIox+VzhhMWOlHIwFg1Fy2XSQhiblCrqw54hquzoLRan9pBvxVQ4gwUFjhQ0S/53 vmtNNiXdkWrQMgWmuAs5I4FBrH0QsQUZmbgTsuFNYSZKGWzcWm8nY/kOLOyQS6W6tdja zIdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YZNUvda46st92EwgfpxkloCbCiAvyOjrA1UUo/tVAk8=; b=TuYZYtAnZRbgPs9n4m9dX2wul+DeeZr5N4kg5HhqMGsP6PbdjBTXzQz0vg64kgnUYQ f1o84yW5cnD2SVSEh20VeWjPmi8Vgz8BKz6JQA1kzlpjjk+SK4dMM43p+II5BlwecNGn N07qwZPJAC2JnDv8hoMzx2aL86KBaVL+ywGGjR3OlIF4sfzDw8ti+tiLuq+qwVkcH/AC 0H10BbSA8ENlyknybt/KitBangJTgUqbj6hLraPUqLUHUolx0KQaLUmRUl6nGINyNnMi WKqd7KNqrQogiOD0mc3x7Ricxw6PPUXd+0Lx61ciGlQUnUcSjCN9ZlyxKLQl4627Mam6 j4iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EyaGJm3s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h90si6405246edd.178.2019.10.27.14.33.12; Sun, 27 Oct 2019 14:33:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EyaGJm3s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731581AbfJ0VT4 (ORCPT + 99 others); Sun, 27 Oct 2019 17:19:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:40232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731551AbfJ0VTt (ORCPT ); Sun, 27 Oct 2019 17:19:49 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 7D4152070B; Sun, 27 Oct 2019 21:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211189; bh=D4p/k8K+pcrKKBqKJkh62m+JChkk/cjGS2MuusHjUes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EyaGJm3sBCKSFey5nRaxN/87+ditK11ku9dQ9IaHFCP8FNMiCtF0w/aPHB9360yd7 /qlzdbnNZDYer3bP4vOJ/+w8vQDFZzLb/+UABZUTM9fpVjVePHokiCKfoEPkJAHoyZ f8DmKqwa/QktzENvEh6qvLm/KMR3624S9+OXawyw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcelo Ricardo Leitner , Jamal Hadi Salim , Jiri Pirko , Cong Wang , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.3 063/197] net_sched: fix backward compatibility for TCA_ACT_KIND Date: Sun, 27 Oct 2019 21:59:41 +0100 Message-Id: <20191027203355.066356964@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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 4b793feccae3b06764268377a4030eb774ed924e ] For TCA_ACT_KIND, we have to keep the backward compatibility too, and rely on nla_strlcpy() to check and terminate the string with a NUL. Note for TC actions, nla_strcmp() is already used to compare kind strings, so we don't need to fix other places. Fixes: 199ce850ce11 ("net_sched: add policy validation for action attributes") Reported-by: Marcelo Ricardo Leitner Cc: Jamal Hadi Salim Cc: Jiri Pirko Signed-off-by: Cong Wang Reviewed-by: Marcelo Ricardo Leitner Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/act_api.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 2558f00f6b3ed..4e7429c6f8649 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -832,8 +832,7 @@ static struct tc_cookie *nla_memdup_cookie(struct nlattr **tb) } static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = { - [TCA_ACT_KIND] = { .type = NLA_NUL_STRING, - .len = IFNAMSIZ - 1 }, + [TCA_ACT_KIND] = { .type = NLA_STRING }, [TCA_ACT_INDEX] = { .type = NLA_U32 }, [TCA_ACT_COOKIE] = { .type = NLA_BINARY, .len = TC_COOKIE_MAX_SIZE }, @@ -865,8 +864,10 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, NL_SET_ERR_MSG(extack, "TC action kind must be specified"); goto err_out; } - nla_strlcpy(act_name, kind, IFNAMSIZ); - + if (nla_strlcpy(act_name, kind, IFNAMSIZ) >= IFNAMSIZ) { + NL_SET_ERR_MSG(extack, "TC action name too long"); + goto err_out; + } if (tb[TCA_ACT_COOKIE]) { cookie = nla_memdup_cookie(tb); if (!cookie) { -- 2.20.1