diff for duplicates of <20180314080831.35cac09c@xeon-e3> diff --git a/a/1.txt b/N1/1.txt index 6d75365..71dc7fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,16 @@ On Wed, 14 Mar 2018 12:01:19 +0100 -Rafał Miłecki <zajec5@gmail.com> wrote: +Rafa=C5=82 Mi=C5=82ecki <zajec5@gmail.com> wrote: -> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/dr= +ivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c > index 19048526b4af..db6987015fb1 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -> @@ -230,6 +230,34 @@ static void brcmf_netdev_set_multicast_list(struct net_device *ndev) +> @@ -230,6 +230,34 @@ static void brcmf_netdev_set_multicast_list(struct n= +et_device *ndev) > schedule_work(&ifp->multicast_work); > } -> +> =20 > +/** > + * brcmf_skb_is_iapp - checks if skb is an IAPP packet > + * @@ -16,22 +18,24 @@ Rafał Miłecki <zajec5@gmail.com> wrote: > + */ > +static bool brcmf_skb_is_iapp(struct sk_buff *skb) > +{ -> + const u8 iapp_l2_update_packet[6] __aligned(2) = { +> + const u8 iapp_l2_update_packet[6] __aligned(2) =3D { > + 0x00, 0x01, 0xaf, 0x81, 0x01, 0x00, > + }; -> + unsigned char *eth_data = skb_mac_header(skb) + ETH_HLEN; +> + unsigned char *eth_data =3D skb_mac_header(skb) + ETH_HLEN; > +#if !defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) -> + const u16 *a = (const u16 *)eth_data; -> + const u16 *b = (const u16 *)iapp_l2_update_packet; +> + const u16 *a =3D (const u16 *)eth_data; +> + const u16 *b =3D (const u16 *)iapp_l2_update_packet; > +#endif > + -> + if (skb->len - skb->mac_len != 6 || +> + if (skb->len - skb->mac_len !=3D 6 || > + !is_multicast_ether_addr(eth_hdr(skb)->h_dest)) > + return false; > + > +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) -> + return !(((*(const u32 *)eth_data) ^ (*(const u32 *)iapp_l2_update_packet)) | -> + ((*(const u16 *)(eth_data + 4)) ^ (*(const u16 *)(iapp_l2_update_packet + 4)))); +> + return !(((*(const u32 *)eth_data) ^ (*(const u32 *)iapp_l2_update_pack= +et)) | +> + ((*(const u16 *)(eth_data + 4)) ^ (*(const u16 *)(iapp_l2_update_pack= +et + 4)))); > +#else > + return !((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])); > +#endif @@ -40,13 +44,14 @@ Rafał Miłecki <zajec5@gmail.com> wrote: > static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, > struct net_device *ndev) > { -> @@ -250,6 +278,12 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, +> @@ -250,6 +278,12 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk= +_buff *skb, > goto done; > } -> +> =20 > + if (!IS_ENABLED(CONFIG_BRCMFMAC_IAPP) && brcmf_skb_is_iapp(skb)) { > + dev_kfree_skb(skb); -> + ret = -EINVAL; +> + ret =3D -EINVAL; > + goto done; > + } > + diff --git a/a/content_digest b/N1/content_digest index c068ae9..d3c54ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,36 +1,39 @@ "ref\020180314110119.13631-1-zajec5@gmail.com\0" "From\0Stephen Hemminger <stephen@networkplumber.org>\0" - "Subject\0Re: [Bridge] [PATCH] brcmfmac: drop Inter-Access Point Protocol packets by default\0" + "Subject\0Re: [PATCH] brcmfmac: drop Inter-Access Point Protocol packets by default\0" "Date\0Wed, 14 Mar 2018 08:08:31 -0700\0" "To\0Rafa\305\202 Mi\305\202ecki <zajec5@gmail.com>\0" - "Cc\0James Hughes <james.hughes@raspberrypi.org>" + "Cc\0Kalle Valo <kvalo@codeaurora.org>" Arend van Spriel <arend.vanspriel@broadcom.com> - netdev@vger.kernel.org - Chi-Hsien Lin <chi-hsien.lin@cypress.com> - bridge@lists.linux-foundation.org - linux-wireless@vger.kernel.org + Franky Lin <franky.lin@broadcom.com> Hante Meuleman <hante.meuleman@broadcom.com> + Chi-Hsien Lin <chi-hsien.lin@cypress.com> + Wright Feng <wright.feng@cypress.com> Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> + James Hughes <james.hughes@raspberrypi.org> + linux-wireless@vger.kernel.org brcm80211-dev-list.pdl@broadcom.com - Wright Feng <wright.feng@cypress.com> - " Rafa\305\202 Mi\305\202ecki <rafal@milecki.pl>" - Felix Fietkau <nbd@nbd.name> brcm80211-dev-list@cypress.com - Kalle Valo <kvalo@codeaurora.org> - " Franky Lin <franky.lin@broadcom.com>\0" + netdev@vger.kernel.org + " Linus L\303\274ssing <linus.luessing@c0d3.blue>" + Felix Fietkau <nbd@nbd.name> + bridge@lists.linux-foundation.org + " Rafa\305\202 Mi\305\202ecki <rafal@milecki.pl>\0" "\00:1\0" "b\0" "On Wed, 14 Mar 2018 12:01:19 +0100\n" - "Rafa\305\202 Mi\305\202ecki <zajec5@gmail.com> wrote:\n" + "Rafa=C5=82 Mi=C5=82ecki <zajec5@gmail.com> wrote:\n" "\n" - "> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n" + "> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/dr=\n" + "ivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n" "> index 19048526b4af..db6987015fb1 100644\n" "> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n" "> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n" - "> @@ -230,6 +230,34 @@ static void brcmf_netdev_set_multicast_list(struct net_device *ndev)\n" + "> @@ -230,6 +230,34 @@ static void brcmf_netdev_set_multicast_list(struct n=\n" + "et_device *ndev)\n" "> \tschedule_work(&ifp->multicast_work);\n" "> }\n" - "> \n" + "> =20\n" "> +/**\n" "> + * brcmf_skb_is_iapp - checks if skb is an IAPP packet\n" "> + *\n" @@ -38,22 +41,24 @@ "> + */\n" "> +static bool brcmf_skb_is_iapp(struct sk_buff *skb)\n" "> +{\n" - "> +\tconst u8 iapp_l2_update_packet[6] __aligned(2) = {\n" + "> +\tconst u8 iapp_l2_update_packet[6] __aligned(2) =3D {\n" "> +\t\t0x00, 0x01, 0xaf, 0x81, 0x01, 0x00,\n" "> +\t};\n" - "> +\tunsigned char *eth_data = skb_mac_header(skb) + ETH_HLEN;\n" + "> +\tunsigned char *eth_data =3D skb_mac_header(skb) + ETH_HLEN;\n" "> +#if !defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)\n" - "> +\tconst u16 *a = (const u16 *)eth_data;\n" - "> +\tconst u16 *b = (const u16 *)iapp_l2_update_packet;\n" + "> +\tconst u16 *a =3D (const u16 *)eth_data;\n" + "> +\tconst u16 *b =3D (const u16 *)iapp_l2_update_packet;\n" "> +#endif\n" "> +\n" - "> +\tif (skb->len - skb->mac_len != 6 ||\n" + "> +\tif (skb->len - skb->mac_len !=3D 6 ||\n" "> +\t !is_multicast_ether_addr(eth_hdr(skb)->h_dest))\n" "> +\t\treturn false;\n" "> +\n" "> +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)\n" - "> +\treturn !(((*(const u32 *)eth_data) ^ (*(const u32 *)iapp_l2_update_packet)) |\n" - "> +\t\t ((*(const u16 *)(eth_data + 4)) ^ (*(const u16 *)(iapp_l2_update_packet + 4))));\n" + "> +\treturn !(((*(const u32 *)eth_data) ^ (*(const u32 *)iapp_l2_update_pack=\n" + "et)) |\n" + "> +\t\t ((*(const u16 *)(eth_data + 4)) ^ (*(const u16 *)(iapp_l2_update_pack=\n" + "et + 4))));\n" "> +#else\n" "> +\treturn !((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2]));\n" "> +#endif\n" @@ -62,13 +67,14 @@ "> static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,\n" "> \t\t\t\t\t struct net_device *ndev)\n" "> {\n" - "> @@ -250,6 +278,12 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,\n" + "> @@ -250,6 +278,12 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk=\n" + "_buff *skb,\n" "> \t\tgoto done;\n" "> \t}\n" - "> \n" + "> =20\n" "> +\tif (!IS_ENABLED(CONFIG_BRCMFMAC_IAPP) && brcmf_skb_is_iapp(skb)) {\n" "> +\t\tdev_kfree_skb(skb);\n" - "> +\t\tret = -EINVAL;\n" + "> +\t\tret =3D -EINVAL;\n" "> +\t\tgoto done;\n" "> +\t}\n" "> +\n" @@ -84,4 +90,4 @@ "#define brcmf_skb_is_app (false)\n" #endif -00995375c4ec29e99171b9373c407ce2094bc0ca7891dd04cb55d3a1a6522dbd +db479c38581387c5a4391d03c1a6cb9f36e9f905f6cff153f9db023de4ef27ef
diff --git a/a/1.txt b/N2/1.txt index 6d75365..5783e74 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,5 +1,5 @@ On Wed, 14 Mar 2018 12:01:19 +0100 -Rafał Miłecki <zajec5@gmail.com> wrote: +Rafał Miłecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c > index 19048526b4af..db6987015fb1 100644 diff --git a/a/content_digest b/N2/content_digest index c068ae9..17225ec 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,29 @@ "ref\020180314110119.13631-1-zajec5@gmail.com\0" - "From\0Stephen Hemminger <stephen@networkplumber.org>\0" - "Subject\0Re: [Bridge] [PATCH] brcmfmac: drop Inter-Access Point Protocol packets by default\0" + "ref\020180314110119.13631-1-zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Stephen Hemminger <stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org>\0" + "Subject\0Re: [PATCH] brcmfmac: drop Inter-Access Point Protocol packets by default\0" "Date\0Wed, 14 Mar 2018 08:08:31 -0700\0" - "To\0Rafa\305\202 Mi\305\202ecki <zajec5@gmail.com>\0" - "Cc\0James Hughes <james.hughes@raspberrypi.org>" - Arend van Spriel <arend.vanspriel@broadcom.com> - netdev@vger.kernel.org - Chi-Hsien Lin <chi-hsien.lin@cypress.com> - bridge@lists.linux-foundation.org - linux-wireless@vger.kernel.org - Hante Meuleman <hante.meuleman@broadcom.com> - Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> - brcm80211-dev-list.pdl@broadcom.com - Wright Feng <wright.feng@cypress.com> - " Rafa\305\202 Mi\305\202ecki <rafal@milecki.pl>" - Felix Fietkau <nbd@nbd.name> - brcm80211-dev-list@cypress.com - Kalle Valo <kvalo@codeaurora.org> - " Franky Lin <franky.lin@broadcom.com>\0" + "To\0Rafa\305\202 Mi\305\202ecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Cc\0Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>" + Arend van Spriel <arend.vanspriel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Franky Lin <franky.lin-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Hante Meuleman <hante.meuleman-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Chi-Hsien Lin <chi-hsien.lin-+wT8y+m8/X5BDgjK7y7TUQ@public.gmane.org> + Wright Feng <wright.feng-+wT8y+m8/X5BDgjK7y7TUQ@public.gmane.org> + Pieter-Paul Giesberts <pieter-paul.giesberts-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + James Hughes <james.hughes-FnsA7b+Nu9XbIbC87yuRow@public.gmane.org> + linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + brcm80211-dev-list.pdl-dY08KVG/lbpWk0Htik3J/w@public.gmane.org + brcm80211-dev-list-+wT8y+m8/X5BDgjK7y7TUQ@public.gmane.org + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " Linus L\303\274ssing <linus.luessing-djzkFPsfvsizQB+pC5nmwQ@public.gmane.org>" + Felix Fietkau <nbd-Vt+b4OUoWG0@public.gmane.org> + bridge-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org + " Rafa\305\202 Mi\305\202ecki <rafal-g1n6cQUeyibVItvQsEIGlw@public.gmane.org>\0" "\00:1\0" "b\0" "On Wed, 14 Mar 2018 12:01:19 +0100\n" - "Rafa\305\202 Mi\305\202ecki <zajec5@gmail.com> wrote:\n" + "Rafa\305\202 Mi\305\202ecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:\n" "\n" "> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n" "> index 19048526b4af..db6987015fb1 100644\n" @@ -84,4 +86,4 @@ "#define brcmf_skb_is_app (false)\n" #endif -00995375c4ec29e99171b9373c407ce2094bc0ca7891dd04cb55d3a1a6522dbd +f592cdcad2784668048731a28fa2329967d211c6c5653512f98a779ac561d7f1
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.