]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
scsi: fcoe: filter out frames from invalid vlans
authorHannes Reinecke <hare@suse.de>
Thu, 13 Oct 2016 13:11:00 +0000 (15:11 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2016 22:29:53 +0000 (17:29 -0500)
Any multicase address is set on all interfaces, the base interface
and any VLAN interfaces on top of this. So we might receive frames
which are not destined for us.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/fcoe/fcoe_ctlr.c

index d773b465886143e6b376cc84a4a74a2c4481c2d1..4aacd60f49b3e2a421a68b1d2994e050b7b27140 100644 (file)
@@ -2754,11 +2754,21 @@ static int fcoe_ctlr_vn_recv(struct fcoe_ctlr *fip, struct sk_buff *skb)
                struct fc_rport_priv rdata;
                struct fcoe_rport frport;
        } buf;
-       int rc;
+       int rc, vlan_id = 0;
 
        fiph = (struct fip_header *)skb->data;
        sub = fiph->fip_subcode;
 
+       if (fip->lp->vlan)
+               vlan_id = skb_vlan_tag_get_id(skb);
+
+       if (vlan_id && vlan_id != fip->lp->vlan) {
+               LIBFCOE_FIP_DBG(fip, "vn_recv drop frame sub %x vlan %d\n",
+                               sub, vlan_id);
+               rc = -EAGAIN;
+               goto drop;
+       }
+
        rc = fcoe_ctlr_vn_parse(fip, skb, &buf.rdata);
        if (rc) {
                LIBFCOE_FIP_DBG(fip, "vn_recv vn_parse error %d\n", rc);