ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: bridge: call pskb_may_pull in br_nf_check_hbh_len

Browse Source 
When checking Hop-by-hop option header, if the option data is in
nonlinear area, it should do pskb_may_pull instead of discarding
the skb as a bad IPv6 packet.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
This commit is contained in:
Xin Long
2023-03-07 16:31:27 -05:00
committed by Florian Westphal
parent 4386b92185
commit 9ccff83b13
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/bridge/br_netfilter_ipv6.c
View File

@@ -45,14 +45,18 @@
*/ */
static int br_nf_check_hbh_len(struct sk_buff *skb) static int br_nf_check_hbh_len(struct sk_buff *skb)
{ {
unsigned char *raw = (u8 *)(ipv6_hdr(skb) + 1); int len, off = sizeof(struct ipv6hdr);
unsigned char *nh;
u32 pkt_len; u32 pkt_len;
const unsigned char *nh = skb_network_header(skb);
int off = raw - nh;
int len = (raw[1] + 1) << 3;
if ((raw + len) - skb->data > skb_headlen(skb)) if (!pskb_may_pull(skb, off + 8))
goto bad; goto bad;
nh = (unsigned char *)(ipv6_hdr(skb) + 1);
len = (nh[1] + 1) << 3;
if (!pskb_may_pull(skb, off + len))
goto bad;
nh = skb_network_header(skb);
off += 2; off += 2;
len -= 2; len -= 2;