* [PATCH net 2/2] macsec: fix checksumming after decryption
@ 2019-06-30 20:46 Andreas Steinmetz
2019-07-01 1:47 ` Willem de Bruijn
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Steinmetz @ 2019-06-30 20:46 UTC (permalink / raw)
To: netdev; +Cc: Sabrina Dubroca
Fix checksumming after decryption.
Signed-off-by: Andreas Steinmetz <ast@domdv.de>
--- a/drivers/net/macsec.c 2019-06-30 22:14:10.250285314 +0200
+++ b/drivers/net/macsec.c 2019-06-30 22:15:11.931230417 +0200
@@ -869,6 +869,7 @@
static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len, u8 hdr_len)
{
+ skb->ip_summed = CHECKSUM_NONE;
memmove(skb->data + hdr_len, skb->data, 2 * ETH_ALEN);
skb_pull(skb, hdr_len);
pskb_trim_unique(skb, skb->len - icv_len);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 2/2] macsec: fix checksumming after decryption
2019-06-30 20:46 [PATCH net 2/2] macsec: fix checksumming after decryption Andreas Steinmetz
@ 2019-07-01 1:47 ` Willem de Bruijn
2019-07-02 4:24 ` Andreas Steinmetz
0 siblings, 1 reply; 6+ messages in thread
From: Willem de Bruijn @ 2019-07-01 1:47 UTC (permalink / raw)
To: Andreas Steinmetz; +Cc: Network Development, Sabrina Dubroca
On Sun, Jun 30, 2019 at 4:48 PM Andreas Steinmetz <ast@domdv.de> wrote:
>
> Fix checksumming after decryption.
>
> Signed-off-by: Andreas Steinmetz <ast@domdv.de>
>
> --- a/drivers/net/macsec.c 2019-06-30 22:14:10.250285314 +0200
> +++ b/drivers/net/macsec.c 2019-06-30 22:15:11.931230417 +0200
> @@ -869,6 +869,7 @@
>
> static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len, u8 hdr_len)
> {
> + skb->ip_summed = CHECKSUM_NONE;
> memmove(skb->data + hdr_len, skb->data, 2 * ETH_ALEN);
> skb_pull(skb, hdr_len);
> pskb_trim_unique(skb, skb->len - icv_len);
Does this belong in macset_reset_skb?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 2/2] macsec: fix checksumming after decryption
2019-07-01 1:47 ` Willem de Bruijn
@ 2019-07-02 4:24 ` Andreas Steinmetz
2019-07-02 14:35 ` Willem de Bruijn
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Steinmetz @ 2019-07-02 4:24 UTC (permalink / raw)
To: Willem de Bruijn; +Cc: Network Development, Sabrina Dubroca
On Sun, 2019-06-30 at 21:47 -0400, Willem de Bruijn wrote:
> On Sun, Jun 30, 2019 at 4:48 PM Andreas Steinmetz <ast@domdv.de>
> wrote:
> > Fix checksumming after decryption.
> >
> > Signed-off-by: Andreas Steinmetz <ast@domdv.de>
> >
> > --- a/drivers/net/macsec.c 2019-06-30 22:14:10.250285314 +0200
> > +++ b/drivers/net/macsec.c 2019-06-30 22:15:11.931230417 +0200
> > @@ -869,6 +869,7 @@
> >
> > static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len,
> > u8 hdr_len)
> > {
> > + skb->ip_summed = CHECKSUM_NONE;
> > memmove(skb->data + hdr_len, skb->data, 2 * ETH_ALEN);
> > skb_pull(skb, hdr_len);
> > pskb_trim_unique(skb, skb->len - icv_len);
>
> Does this belong in macset_reset_skb?
Putting this in macsec_reset_skb would then miss out the "nosci:" part
of the RX path in macsec_handle_frame().
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 2/2] macsec: fix checksumming after decryption
2019-07-02 4:24 ` Andreas Steinmetz
@ 2019-07-02 14:35 ` Willem de Bruijn
2019-07-02 19:47 ` Andreas Steinmetz
0 siblings, 1 reply; 6+ messages in thread
From: Willem de Bruijn @ 2019-07-02 14:35 UTC (permalink / raw)
To: Andreas Steinmetz; +Cc: Network Development, Sabrina Dubroca
On Tue, Jul 2, 2019 at 12:25 AM Andreas Steinmetz <ast@domdv.de> wrote:
>
> On Sun, 2019-06-30 at 21:47 -0400, Willem de Bruijn wrote:
> > On Sun, Jun 30, 2019 at 4:48 PM Andreas Steinmetz <ast@domdv.de>
> > wrote:
> > > Fix checksumming after decryption.
> > >
> > > Signed-off-by: Andreas Steinmetz <ast@domdv.de>
> > >
> > > --- a/drivers/net/macsec.c 2019-06-30 22:14:10.250285314 +0200
> > > +++ b/drivers/net/macsec.c 2019-06-30 22:15:11.931230417 +0200
> > > @@ -869,6 +869,7 @@
> > >
> > > static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len,
> > > u8 hdr_len)
> > > {
> > > + skb->ip_summed = CHECKSUM_NONE;
> > > memmove(skb->data + hdr_len, skb->data, 2 * ETH_ALEN);
> > > skb_pull(skb, hdr_len);
> > > pskb_trim_unique(skb, skb->len - icv_len);
> >
> > Does this belong in macset_reset_skb?
>
> Putting this in macsec_reset_skb would then miss out the "nosci:" part
> of the RX path in macsec_handle_frame().
It is called on each nskb before calling netif_rx.
It indeed is not called when returning RX_HANDLER_PASS, but that is correct?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 2/2] macsec: fix checksumming after decryption
2019-07-02 14:35 ` Willem de Bruijn
@ 2019-07-02 19:47 ` Andreas Steinmetz
2019-07-03 1:47 ` Willem de Bruijn
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Steinmetz @ 2019-07-02 19:47 UTC (permalink / raw)
To: Willem de Bruijn; +Cc: Network Development, Sabrina Dubroca
On Tue, 2019-07-02 at 10:35 -0400, Willem de Bruijn wrote:
> On Tue, Jul 2, 2019 at 12:25 AM Andreas Steinmetz <ast@domdv.de> wrote:
> > On Sun, 2019-06-30 at 21:47 -0400, Willem de Bruijn wrote:
> > > On Sun, Jun 30, 2019 at 4:48 PM Andreas Steinmetz <ast@domdv.de>
> > > wrote:
> > > > Fix checksumming after decryption.
> > > >
> > > > Signed-off-by: Andreas Steinmetz <ast@domdv.de>
> > > >
> > > > --- a/drivers/net/macsec.c 2019-06-30 22:14:10.250285314 +0200
> > > > +++ b/drivers/net/macsec.c 2019-06-30 22:15:11.931230417 +0200
> > > > @@ -869,6 +869,7 @@
> > > >
> > > > static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len,
> > > > u8 hdr_len)
> > > > {
> > > > + skb->ip_summed = CHECKSUM_NONE;
> > > > memmove(skb->data + hdr_len, skb->data, 2 * ETH_ALEN);
> > > > skb_pull(skb, hdr_len);
> > > > pskb_trim_unique(skb, skb->len - icv_len);
> > >
> > > Does this belong in macset_reset_skb?
> >
> > Putting this in macsec_reset_skb would then miss out the "nosci:" part
> > of the RX path in macsec_handle_frame().
>
> It is called on each nskb before calling netif_rx.
>
> It indeed is not called when returning RX_HANDLER_PASS, but that is correct?
This is correct. Packets passed on with RX_HANDLER_PASS are either not for this
driver or the special case of being destined for a KaY and in this case being
the MACsec ethernet protocol and thus not IP, so no checksumming.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 2/2] macsec: fix checksumming after decryption
2019-07-02 19:47 ` Andreas Steinmetz
@ 2019-07-03 1:47 ` Willem de Bruijn
0 siblings, 0 replies; 6+ messages in thread
From: Willem de Bruijn @ 2019-07-03 1:47 UTC (permalink / raw)
To: Andreas Steinmetz; +Cc: Willem de Bruijn, Network Development, Sabrina Dubroca
On Tue, Jul 2, 2019 at 3:48 PM Andreas Steinmetz <ast@domdv.de> wrote:
>
> On Tue, 2019-07-02 at 10:35 -0400, Willem de Bruijn wrote:
> > On Tue, Jul 2, 2019 at 12:25 AM Andreas Steinmetz <ast@domdv.de> wrote:
> > > On Sun, 2019-06-30 at 21:47 -0400, Willem de Bruijn wrote:
> > > > On Sun, Jun 30, 2019 at 4:48 PM Andreas Steinmetz <ast@domdv.de>
> > > > wrote:
> > > > > Fix checksumming after decryption.
> > > > >
> > > > > Signed-off-by: Andreas Steinmetz <ast@domdv.de>
> > > > >
> > > > > --- a/drivers/net/macsec.c 2019-06-30 22:14:10.250285314 +0200
> > > > > +++ b/drivers/net/macsec.c 2019-06-30 22:15:11.931230417 +0200
> > > > > @@ -869,6 +869,7 @@
> > > > >
> > > > > static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len,
> > > > > u8 hdr_len)
> > > > > {
> > > > > + skb->ip_summed = CHECKSUM_NONE;
> > > > > memmove(skb->data + hdr_len, skb->data, 2 * ETH_ALEN);
> > > > > skb_pull(skb, hdr_len);
> > > > > pskb_trim_unique(skb, skb->len - icv_len);
> > > >
> > > > Does this belong in macset_reset_skb?
> > >
> > > Putting this in macsec_reset_skb would then miss out the "nosci:" part
> > > of the RX path in macsec_handle_frame().
> >
> > It is called on each nskb before calling netif_rx.
> >
> > It indeed is not called when returning RX_HANDLER_PASS, but that is correct?
>
> This is correct. Packets passed on with RX_HANDLER_PASS are either not for this
> driver or the special case of being destined for a KaY and in this case being
> the MACsec ethernet protocol and thus not IP, so no checksumming.
So this could have been set in macsec_reset_skb, then? As all relevant cases
call it. Anyway, it's not very important and already merged.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-03 1:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-30 20:46 [PATCH net 2/2] macsec: fix checksumming after decryption Andreas Steinmetz
2019-07-01 1:47 ` Willem de Bruijn
2019-07-02 4:24 ` Andreas Steinmetz
2019-07-02 14:35 ` Willem de Bruijn
2019-07-02 19:47 ` Andreas Steinmetz
2019-07-03 1:47 ` Willem de Bruijn
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).