releases/4.6.5/macsec-set-actual-real-device-for-xmit-when-protect_frames.patch

   1 From foo@baz Thu Jul 14 07:36:41 JST 2016
   2 From: Daniel Borkmann <daniel@iogearbox.net>
   3 Date: Fri, 1 Jul 2016 00:00:54 +0200
   4 Subject: macsec: set actual real device for xmit when !protect_frames
   5
   6 From: Daniel Borkmann <daniel@iogearbox.net>
   7
   8 [ Upstream commit 79c62220d74a4a3f961a2cb7320da09eebf5daf7 ]
   9
  10 Avoid recursions of dev_queue_xmit() to the wrong net device when
  11 frames are unprotected, since at that time skb->dev still points to
  12 our own macsec dev and unlike macsec_encrypt_finish() dev pointer
  13 doesn't get updated to real underlying device.
  14
  15 Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver")
  16 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  17 Acked-by: Sabrina Dubroca <sd@queasysnail.net>
  18 Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
  19 Signed-off-by: David S. Miller <davem@davemloft.net>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/net/macsec.c |    1 +
  23  1 file changed, 1 insertion(+)
  24
  25 --- a/drivers/net/macsec.c
  26 +++ b/drivers/net/macsec.c
  27 @@ -2564,6 +2564,7 @@ static netdev_tx_t macsec_start_xmit(str
  28                 u64_stats_update_begin(&secy_stats->syncp);
  29                 secy_stats->stats.OutPktsUntagged++;
  30                 u64_stats_update_end(&secy_stats->syncp);
  31 +               skb->dev = macsec->real_dev;
  32                 len = skb->len;
  33                 ret = dev_queue_xmit(skb);
  34                 count_tx(dev, ret, len);