4.6-stable review patch. If anyone has any objections, please let me know.
------------------ From: Daniel Borkmann <[email protected]> [ Upstream commit 79c62220d74a4a3f961a2cb7320da09eebf5daf7 ] Avoid recursions of dev_queue_xmit() to the wrong net device when frames are unprotected, since at that time skb->dev still points to our own macsec dev and unlike macsec_encrypt_finish() dev pointer doesn't get updated to real underlying device. Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") Signed-off-by: Daniel Borkmann <[email protected]> Acked-by: Sabrina Dubroca <[email protected]> Acked-by: Hannes Frederic Sowa <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/net/macsec.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -2564,6 +2564,7 @@ static netdev_tx_t macsec_start_xmit(str u64_stats_update_begin(&secy_stats->syncp); secy_stats->stats.OutPktsUntagged++; u64_stats_update_end(&secy_stats->syncp); + skb->dev = macsec->real_dev; len = skb->len; ret = dev_queue_xmit(skb); count_tx(dev, ret, len);
