Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp686419lqb; Wed, 17 Apr 2024 08:05:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWz3PWfy4E3uzZh334NioZF3bJmTXKM398M0xG6dnapgAz8+iiZoz3Q6Gi+PwYEpxsy7KwhEQMEkjACyCgSfNow490L6149cl+QDBo+jw== X-Google-Smtp-Source: AGHT+IFwuwcRAYeQF5bylzlsAU/UAO8wdkWGVm6wgAbZeIB5Rcpe4gLoJSoX9q70zNlro1bmo5cN X-Received: by 2002:a05:6a20:d42a:b0:1a7:6262:1dd1 with SMTP id il42-20020a056a20d42a00b001a762621dd1mr13032658pzb.51.1713366303988; Wed, 17 Apr 2024 08:05:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713366303; cv=pass; d=google.com; s=arc-20160816; b=l16jox5KdItz3lCOQlNeINsmD04C0dLoYOziykJVyXKL/i+I32gOIUVhkTcydr0Z5m o9HN+6WFrCJCYbIR6iPFdGd0El1N0WUKB1X2/M5+b9BbUBiNc4qnTJrsWnI3uHzUxk3O 4lbBq03wPExbFKHAoJycEaIs8R7z+i5ibW9+ZHI5N2lPtOsTP17HUs76Uq0z7Krb33y8 s3Qe75xrhIcaQEvJQJtv1AHzAjo0IdzJcW5ko79mALyQyQPNMQ9U45/AQJHmWiyY88xV 3XCpBrZ4ZrMgOrSrAcnemcs9fxGz1uPYnnv02bP5WWmhT8Es9kSjAbeBNiZgixw0I9fB 8WFg== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=0gP8mNE9BpC45dkZH7/6sssgcEF1Z/cycs0xVCeoUts=; fh=L2JHL8E0QN6yqMKbCzJnT8CRWSy8E/aHvUnCTTIRG+Y=; b=M86I9m5V7v97QCuQZyzzfG0IzWnMrI0Ip+SH4Dlhu+X+OfeB5U/5khKav8y7cHxgN4 pIPweGSg4H9D4fHek6Z07k1HfuFuOidGsBxR2OK/RKUVRehm2rWHZwpYHELHjcGTdtiV gIdQ7hhlEXgddbmKaMTwMbvnDCcj0LVoK+TS3qNfBX2Gd72Lg2q9CxUTnekOpaYvOYkL qfx83+0haanPFwY9QTBklPcPQG33yT4ziiZxU7suXezVMOLb3F7vKWnXUiECy1RZJbxm cjeoTgY03cl5ELJfGRhqD2PlrRpVtjoOWZ8n4djJJUYcKQ8ES2kFyKj8v8iGXei+oyvA 8W+g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fiberby.net header.s=202008 header.b=IJdd2bTY; arc=pass (i=1 spf=pass spfdomain=fiberby.net dkim=pass dkdomain=fiberby.net dmarc=pass fromdomain=fiberby.net); spf=pass (google.com: domain of linux-kernel+bounces-148715-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-148715-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fiberby.net Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id d3-20020a63d703000000b005d8e1dc1df6si11729624pgg.731.2024.04.17.08.05.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 08:05:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-148715-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@fiberby.net header.s=202008 header.b=IJdd2bTY; arc=pass (i=1 spf=pass spfdomain=fiberby.net dkim=pass dkdomain=fiberby.net dmarc=pass fromdomain=fiberby.net); spf=pass (google.com: domain of linux-kernel+bounces-148715-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-148715-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fiberby.net 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id B9EBEB26B83 for ; Wed, 17 Apr 2024 14:48:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B3B5A145B27; Wed, 17 Apr 2024 14:44:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b="IJdd2bTY" Received: from mail1.fiberby.net (mail1.fiberby.net [193.104.135.124]) (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 72966140E5E; Wed, 17 Apr 2024 14:44:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.104.135.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713365078; cv=none; b=kK0WRYjTfMp3axc5Bwn67yfKbn4HwX8D6uYeDBSeQMBdqbMSzlGNQfn6GQWBMd4iKpzoU5Xz5CEIz7Y0GcRdC7WIIePqVLKvHiEmkgJQ91DTuJc60cNZlHMzgSGKZApsmmYcgJBlf6ZGesk43xsUWF8TQpvzlk8y3V45a4d3nnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713365078; c=relaxed/simple; bh=eyPztPGpoTcAfA8TrZ2aBkQkDvbE2JrkMRHX1Zzaf+M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=pqbtJYecnYNOMc76b2a8nWxXxlG2mQzJei7ng1NtLVE8jVkTfyN500OmY/gBPovV54xbTu7orJuCSzPvBPuPLPjzdEU8jGKOqE/OSC5BIBP1QBbAJtKKwAvuWI0591SwZJVcV2oopHGE7L9MOVYg4kAsMxNKu5Vl/b4M2hzZG5c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net; spf=pass smtp.mailfrom=fiberby.net; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b=IJdd2bTY; arc=none smtp.client-ip=193.104.135.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fiberby.net Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id 35A16600A2; Wed, 17 Apr 2024 14:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1713365075; bh=eyPztPGpoTcAfA8TrZ2aBkQkDvbE2JrkMRHX1Zzaf+M=; h=From:To:Cc:Subject:Date:From; b=IJdd2bTYgL2RcCYJgrqL9cT1WC2KFNEtOT9s7v/I7gTpElCE1HiD9F9yIwZphQKch LHN5o5e1tgjxad7b5YBONDdQn6R9sy+QOSBQSAYRzkceakGq+XZAusNgLtjTKyx3Kg AGivZTv33klrZW2J/JanfMfv9euwsBPlRh0t/DIeZYKZGjv/Z7FMzpB48TDR1l/RFN 0xwqMdXmyErKO7538i8k4E9CIFZEwZ9of2Ki+MMxjUWMpHnQfXAMVwPJ7AuDK56SzY SjNkDckWMc/ahv/3yxlmZVe+6UwnGzrCFuS2jm8sbcRbi9XVvlDnKh32GuyW1dRMCl 8uKH/uASey2GA== Received: by x201s (Postfix, from userid 1000) id 8955720445E; Wed, 17 Apr 2024 14:44:07 +0000 (UTC) From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: netdev@vger.kernel.org Cc: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli Subject: [PATCH net-next] net: dsa: felix: flower: validate control flags Date: Wed, 17 Apr 2024 14:44:06 +0000 Message-ID: <20240417144407.104241-1-ast@fiberby.net> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This driver currently doesn't support any control flags. Use flow_rule_match_has_control_flags() to check for control flags, such as can be set through `tc flower ... ip_flags frag`. In case any control flags are masked, flow_rule_match_has_control_flags() sets a NL extended error message, and we return -EOPNOTSUPP. Only compile-tested. Signed-off-by: Asbjørn Sloth Tønnesen --- drivers/net/dsa/ocelot/felix_vsc9959.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c index 3c5509e75a54..85952d841f28 100644 --- a/drivers/net/dsa/ocelot/felix_vsc9959.c +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c @@ -1755,6 +1755,9 @@ static int vsc9959_stream_identify(struct flow_cls_offload *f, BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS))) return -EOPNOTSUPP; + if (flow_rule_match_has_control_flags(rule, f->common.extack)) + return -EOPNOTSUPP; + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) { struct flow_match_eth_addrs match; -- 2.43.0