From: Michal Schmidt <mschmidt@redhat.com>
To: netdev@vger.kernel.org
Cc: Yuval Mintz <Yuval.Mintz@cavium.com>,
Ariel Elior <ariel.elior@cavium.com>
Subject: [PATCH net 3/7] bnx2x: fix possible overrun of VFPF multicast addresses array
Date: Fri, 3 Mar 2017 17:08:30 +0100 [thread overview]
Message-ID: <20170303160834.4125-4-mschmidt@redhat.com> (raw)
In-Reply-To: <20170303160834.4125-1-mschmidt@redhat.com>
It is too late to check for the limit of the number of VF multicast
addresses after they have already been copied to the req->multicast[]
array, possibly overflowing it.
Do the check before copying.
Also fix the error path to not skip unlocking vf2pf_mutex.
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index bfae300cf2..c2d327d9df 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -868,7 +868,7 @@ int bnx2x_vfpf_set_mcast(struct net_device *dev)
struct bnx2x *bp = netdev_priv(dev);
struct vfpf_set_q_filters_tlv *req = &bp->vf2pf_mbox->req.set_q_filters;
struct pfvf_general_resp_tlv *resp = &bp->vf2pf_mbox->resp.general_resp;
- int rc, i = 0;
+ int rc = 0, i = 0;
struct netdev_hw_addr *ha;
if (bp->state != BNX2X_STATE_OPEN) {
@@ -883,6 +883,15 @@ int bnx2x_vfpf_set_mcast(struct net_device *dev)
/* Get Rx mode requested */
DP(NETIF_MSG_IFUP, "dev->flags = %x\n", dev->flags);
+ /* We support PFVF_MAX_MULTICAST_PER_VF mcast addresses tops */
+ if (netdev_mc_count(dev) > PFVF_MAX_MULTICAST_PER_VF) {
+ DP(NETIF_MSG_IFUP,
+ "VF supports not more than %d multicast MAC addresses\n",
+ PFVF_MAX_MULTICAST_PER_VF);
+ rc = -EINVAL;
+ goto out;
+ }
+
netdev_for_each_mc_addr(ha, dev) {
DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
bnx2x_mc_addr(ha));
@@ -890,16 +899,6 @@ int bnx2x_vfpf_set_mcast(struct net_device *dev)
i++;
}
- /* We support four PFVF_MAX_MULTICAST_PER_VF mcast
- * addresses tops
- */
- if (i >= PFVF_MAX_MULTICAST_PER_VF) {
- DP(NETIF_MSG_IFUP,
- "VF supports not more than %d multicast MAC addresses\n",
- PFVF_MAX_MULTICAST_PER_VF);
- return -EINVAL;
- }
-
req->n_multicast = i;
req->flags |= VFPF_SET_Q_FILTERS_MULTICAST_CHANGED;
req->vf_qid = 0;
@@ -924,7 +923,7 @@ int bnx2x_vfpf_set_mcast(struct net_device *dev)
out:
bnx2x_vfpf_finalize(bp, &req->first_tlv);
- return 0;
+ return rc;
}
/* request pf to add a vlan for the vf */
--
2.9.3
next prev parent reply other threads:[~2017-03-03 16:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 16:08 [PATCH net 0/7] bnx2x: PTP crash, VF VLAN fixes Michal Schmidt
2017-03-03 16:08 ` [PATCH net 1/7] bnx2x: prevent crash when accessing PTP with interface down Michal Schmidt
2017-03-05 9:43 ` Mintz, Yuval
2017-03-06 14:04 ` Michal Schmidt
2017-03-03 16:08 ` [PATCH net 2/7] bnx2x: lower verbosity of VF stats debug messages Michal Schmidt
2017-03-03 16:08 ` Michal Schmidt [this message]
2017-03-05 9:55 ` [PATCH net 3/7] bnx2x: fix possible overrun of VFPF multicast addresses array Mintz, Yuval
2017-03-06 14:45 ` [PATCH net 3/7 v2] " Michal Schmidt
2017-03-07 15:54 ` Mintz, Yuval
2017-03-03 16:08 ` [PATCH net 4/7] bnx2x: fix detection of VLAN filtering feature for VF Michal Schmidt
2017-03-03 16:08 ` [PATCH net 5/7] bnx2x: do not rollback VF MAC/VLAN filters we did not configure Michal Schmidt
2017-03-05 10:13 ` Mintz, Yuval
2017-03-06 14:05 ` Michal Schmidt
2017-03-03 16:08 ` [PATCH net 6/7] bnx2x: fix incorrect filter count in an error message Michal Schmidt
2017-03-03 16:08 ` [PATCH net 7/7] bnx2x: add missing configuration of VF VLAN filters Michal Schmidt
2017-03-05 10:17 ` [PATCH net 0/7] bnx2x: PTP crash, VF VLAN fixes Mintz, Yuval
2017-03-07 21:53 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170303160834.4125-4-mschmidt@redhat.com \
--to=mschmidt@redhat.com \
--cc=Yuval.Mintz@cavium.com \
--cc=ariel.elior@cavium.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).