* [PATCH net] macsec: set actual real device for xmit when !protect_frames
@ 2016-06-30 22:00 Daniel Borkmann
2016-07-01 11:32 ` Hannes Frederic Sowa
2016-07-01 20:36 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Borkmann @ 2016-06-30 22:00 UTC (permalink / raw)
To: davem; +Cc: sd, hannes, netdev, Daniel Borkmann
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 <daniel@iogearbox.net>
Acked-by: Sabrina Dubroca <sd@queasysnail.net>
---
drivers/net/macsec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 0e7eff7..8bcd78f 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -2640,6 +2640,7 @@ static netdev_tx_t macsec_start_xmit(struct sk_buff *skb,
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);
--
1.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] macsec: set actual real device for xmit when !protect_frames
2016-06-30 22:00 [PATCH net] macsec: set actual real device for xmit when !protect_frames Daniel Borkmann
@ 2016-07-01 11:32 ` Hannes Frederic Sowa
2016-07-01 20:36 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Hannes Frederic Sowa @ 2016-07-01 11:32 UTC (permalink / raw)
To: Daniel Borkmann, davem; +Cc: sd, netdev
On 01.07.2016 00:00, Daniel Borkmann wrote:
> 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 <daniel@iogearbox.net>
> Acked-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] macsec: set actual real device for xmit when !protect_frames
2016-06-30 22:00 [PATCH net] macsec: set actual real device for xmit when !protect_frames Daniel Borkmann
2016-07-01 11:32 ` Hannes Frederic Sowa
@ 2016-07-01 20:36 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-07-01 20:36 UTC (permalink / raw)
To: daniel; +Cc: sd, hannes, netdev
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Fri, 1 Jul 2016 00:00:54 +0200
> 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 <daniel@iogearbox.net>
> Acked-by: Sabrina Dubroca <sd@queasysnail.net>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-01 20:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-30 22:00 [PATCH net] macsec: set actual real device for xmit when !protect_frames Daniel Borkmann
2016-07-01 11:32 ` Hannes Frederic Sowa
2016-07-01 20:36 ` 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).