diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2023-08-23 16:41:02 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-23 11:48:11 +0300 |
commit | 62b12b91f3ef00140edad7b624ab1702b2149198 (patch) | |
tree | ce79a452e43f7844f0022fb3579928b78f108a9c /include | |
parent | fbb3ad9fb457d4e6dd040d6794639292f84b8a0f (diff) | |
download | linux-62b12b91f3ef00140edad7b624ab1702b2149198.tar.xz |
net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
commit a4f39c9f14a634e4cd35fcd338c239d11fcc73fc upstream.
The goal is to support a bpf_redirect() from an ethernet device (ingress)
to a ppp device (egress).
The l2 header is added automatically by the ppp driver, thus the ethernet
header should be removed.
CC: stable@vger.kernel.org
Fixes: 27b29f63058d ("bpf: add bpf_redirect() helper")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Tested-by: Siwar Zitouni <siwar.zitouni@6wind.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/if_arp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index c697a0524273..a6f14d8e4e81 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -56,6 +56,10 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) case ARPHRD_NONE: case ARPHRD_RAWIP: case ARPHRD_PIMREG: + /* PPP adds its l2 header automatically in ppp_start_xmit(). + * This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init(). + */ + case ARPHRD_PPP: return false; default: return true; |