From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id BD511A0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 14:59:42 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id B47C31D5DE;
Tue, 19 May 2020 14:59:42 +0200 (CEST)
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 1F00D1D5E1
for <stable@dpdk.org>; Tue, 19 May 2020 14:59:41 +0200 (CEST)
Received: by mail-wr1-f66.google.com with SMTP id j5so15855018wrq.2
for <stable@dpdk.org>; Tue, 19 May 2020 05:59:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=r8qbjMEmzkFvFyIa7I33HNjpluJr2RLhGA4XlczDjHg=;
b=sXhCsm5wnl7rvmHEVxKoDiggoGu/gJ9qmfRaD94Mb9XKe141vH8QumVWXyrOkthPzM
xrxk0sX1ws4P3QSEdHv13ZIyhlb/B/a1A0F+nBDCWh88flVosJQs4ql2XbeQapFrbUJE
+u642e6ATSxCtloMH2AIY8smUusMfqkerYwiG04zJaPzGJVnm+7C+NemLAmTuoAjJy1C
CzM5CH1edchModo8LjCCLQBPkSMGwBThBNhb7tPdYHSa8xRNasHIAjVtWKlZEgsnJJNR
DkHZhWZOGA4p2YNyMjEETKl2vqahXdnVf2Crt9FQlZmoiKZ19xD/d4kDiWlevuYKyR8s
KXjQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=r8qbjMEmzkFvFyIa7I33HNjpluJr2RLhGA4XlczDjHg=;
b=ewuAetstGOJT58M34bF50GbMeNwU98NAJZz8TUaR+Pd8mnTKpJGzXWgtbzV0K/cCKl
6iVfMczHCh4yFBLIkODpcnPatGf6XSX2N3qMzmzkV5j5nL5KNbdJY8/2Z0q7Xz14HEms
XW9+zBzBrwJtzshv2omihj7y89x1zLSxaVGOQqWNSoWP9D7QIQAGFatzaTv0k89Pbo3Z
elA8KdDKa190jW9AKWWm5wtbpt0nP9oDZD63q+toz4omXGvSUBhYEJp+g/Tyx3MsaO8A
zf5GMkP385oJI44776EdG6I04wFHrCC+RRKclX/pjdhhyGWVolQxnFj7CqZQV1cWbm4l
7hMA==
X-Gm-Message-State: AOAM530j+Ie3C9COlP/tT2K/wuD2De0uNIIvSYShbbMuW5pgKB22z1Yt
aSlCcdg4qDFMUTX3nPPJ4nU=
X-Google-Smtp-Source: ABdhPJziO0zkNBELmZ/GDti7Mfs5knJ52GeviFyVB/sdl5pLi9/w68moW98q5/Qijk+2Wa6Q3O26iA==
X-Received: by 2002:adf:a1cb:: with SMTP id v11mr27829329wrv.39.1589893180866;
Tue, 19 May 2020 05:59:40 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id o7sm3633186wmc.43.2020.05.19.05.59.40
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 05:59:40 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Igor Romanov <igor.romanov@oktetlabs.ru>
Cc: Andrew Rybchenko <arybchenko@solarflare.com>, dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 13:53:51 +0100
Message-Id: <20200519125804.104349-41-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com>
References: <20200519125804.104349-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/sfc/base: reject automatic filter creation
by users' has been queued to stable release 19.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 9e496b76abe42d8acb49fd15c6b6960f775207aa Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 10 Mar 2020 09:48:37 +0000
Subject: [PATCH] net/sfc/base: reject automatic filter creation by users
[ upstream commit fbf423bbf2d298e4fc0e3f3a0d498ddb8bada94b ]
The automatic filter priority may only be used by filter implementation,
so reject the attempts to create such filters by client drivers.
Fixes: f9565517ff4f ("net/sfc/base: import filters support")
Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/efx_filter.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/sfc/base/efx_filter.c b/drivers/net/sfc/base/efx_filter.c
index 575f6228be..36332a2801 100644
--- a/drivers/net/sfc/base/efx_filter.c
+++ b/drivers/net/sfc/base/efx_filter.c
@@ -93,8 +93,15 @@ efx_filter_insert(
goto fail2;
}
+ if (spec->efs_priority == EFX_FILTER_PRI_AUTO) {
+ rc = EINVAL;
+ goto fail3;
+ }
+
return (efop->efo_add(enp, spec, B_FALSE));
+fail3:
+ EFSYS_PROBE(fail3);
fail2:
EFSYS_PROBE(fail2);
fail1:
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 13:56:20.510475961 +0100
+++ 0041-net-sfc-base-reject-automatic-filter-creation-by-use.patch 2020-05-19 13:56:18.243502251 +0100
@@ -1,13 +1,14 @@
-From fbf423bbf2d298e4fc0e3f3a0d498ddb8bada94b Mon Sep 17 00:00:00 2001
+From 9e496b76abe42d8acb49fd15c6b6960f775207aa Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 10 Mar 2020 09:48:37 +0000
Subject: [PATCH] net/sfc/base: reject automatic filter creation by users
+[ upstream commit fbf423bbf2d298e4fc0e3f3a0d498ddb8bada94b ]
+
The automatic filter priority may only be used by filter implementation,
so reject the attempts to create such filters by client drivers.
Fixes: f9565517ff4f ("net/sfc/base: import filters support")
-Cc: stable@dpdk.org
Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>