* [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow()
@ 2020-09-02 11:18 Denis Efremov
2020-09-02 17:53 ` Doug Berger
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Denis Efremov @ 2020-09-02 11:18 UTC (permalink / raw)
To: Doug Berger
Cc: Denis Efremov, Florian Fainelli, David S. Miller, Jakub Kicinski,
bcm-kernel-feedback-list, netdev, linux-kernel, stable
VALIDATE_MASK(eth_mask->h_source) is checked twice in a row in
bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest)
instead.
Fixes: 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")
Cc: stable@vger.kernel.org
Signed-off-by: Denis Efremov <efremov@linux.com>
---
I'm not sure that h_dest check is required here, it's only my guess.
Compile tested only.
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 0ca8436d2e9d..be85dad2e3bc 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1364,7 +1364,7 @@ static int bcmgenet_validate_flow(struct net_device *dev,
case ETHER_FLOW:
eth_mask = &cmd->fs.m_u.ether_spec;
/* don't allow mask which isn't valid */
- if (VALIDATE_MASK(eth_mask->h_source) ||
+ if (VALIDATE_MASK(eth_mask->h_dest) ||
VALIDATE_MASK(eth_mask->h_source) ||
VALIDATE_MASK(eth_mask->h_proto)) {
netdev_err(dev, "rxnfc: Unsupported mask\n");
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow()
2020-09-02 11:18 [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow() Denis Efremov
@ 2020-09-02 17:53 ` Doug Berger
2020-09-02 17:53 ` Florian Fainelli
2020-09-02 19:54 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Doug Berger @ 2020-09-02 17:53 UTC (permalink / raw)
To: Denis Efremov
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski,
bcm-kernel-feedback-list, netdev, linux-kernel, stable
On 9/2/2020 4:18 AM, Denis Efremov wrote:
> VALIDATE_MASK(eth_mask->h_source) is checked twice in a row in
> bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest)
> instead.
>
> Fixes: 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")
> Cc: stable@vger.kernel.org
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
> I'm not sure that h_dest check is required here, it's only my guess.
> Compile tested only.
>
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 0ca8436d2e9d..be85dad2e3bc 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -1364,7 +1364,7 @@ static int bcmgenet_validate_flow(struct net_device *dev,
> case ETHER_FLOW:
> eth_mask = &cmd->fs.m_u.ether_spec;
> /* don't allow mask which isn't valid */
> - if (VALIDATE_MASK(eth_mask->h_source) ||
> + if (VALIDATE_MASK(eth_mask->h_dest) ||
> VALIDATE_MASK(eth_mask->h_source) ||
> VALIDATE_MASK(eth_mask->h_proto)) {
> netdev_err(dev, "rxnfc: Unsupported mask\n");
>
Well spotted. Thanks!
Acked-by: Doug Berger <opendmb@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow()
2020-09-02 11:18 [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow() Denis Efremov
2020-09-02 17:53 ` Doug Berger
@ 2020-09-02 17:53 ` Florian Fainelli
2020-09-02 19:54 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2020-09-02 17:53 UTC (permalink / raw)
To: Denis Efremov, Doug Berger
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski,
bcm-kernel-feedback-list, netdev, linux-kernel, stable
On 9/2/2020 4:18 AM, Denis Efremov wrote:
> VALIDATE_MASK(eth_mask->h_source) is checked twice in a row in
> bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest)
> instead.
>
> Fixes: 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")
> Cc: stable@vger.kernel.org
> Signed-off-by: Denis Efremov <efremov@linux.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow()
2020-09-02 11:18 [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow() Denis Efremov
2020-09-02 17:53 ` Doug Berger
2020-09-02 17:53 ` Florian Fainelli
@ 2020-09-02 19:54 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-09-02 19:54 UTC (permalink / raw)
To: efremov
Cc: opendmb, f.fainelli, kuba, bcm-kernel-feedback-list, netdev,
linux-kernel, stable
From: Denis Efremov <efremov@linux.com>
Date: Wed, 2 Sep 2020 14:18:45 +0300
> VALIDATE_MASK(eth_mask->h_source) is checked twice in a row in
> bcmgenet_validate_flow(). Add VALIDATE_MASK(eth_mask->h_dest)
> instead.
>
> Fixes: 3e370952287c ("net: bcmgenet: add support for ethtool rxnfc flows")
> Cc: stable@vger.kernel.org
> Signed-off-by: Denis Efremov <efremov@linux.com>
Please do not CC: stable for networking patches.
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-02 19:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-02 11:18 [PATCH] net: bcmgenet: fix mask check in bcmgenet_validate_flow() Denis Efremov
2020-09-02 17:53 ` Doug Berger
2020-09-02 17:53 ` Florian Fainelli
2020-09-02 19:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).