xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bareudp: Fix invalid read beyond skb's linear data

Browse Source 
[ Upstream commit 143a8526ab5fd4f8a0c4fe2a9cb28c181dc5a95f ]

Data beyond the UDP header might not be part of the skb's linear data.
Use skb_copy_bits() instead of direct access to skb->data+X, so that
we read the correct bytes even on a fragmented skb.

Fixes: 4b5f67232d ("net: Special handling for IP & MPLS.")
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Link: https://lore.kernel.org/r/7741c46545c6ef02e70c80a9b32814b22d9616b3.1628264975.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Guillaume Nault
2021-08-06 17:52:06 +02:00
committed by Greg Kroah-Hartman
parent 30b1fc47f7
commit 00a0c11ddd
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/bareudp.c
View File

@@ -71,12 +71,18 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
family = AF_INET6; family = AF_INET6;
if (bareudp->ethertype == htons(ETH_P_IP)) { if (bareudp->ethertype == htons(ETH_P_IP)) {
struct iphdr *iphdr; __u8 ipversion;
iphdr = (struct iphdr *)(skb->data + BAREUDP_BASE_HLEN); if (skb_copy_bits(skb, BAREUDP_BASE_HLEN, &ipversion,
if (iphdr->version == 4) { sizeof(ipversion))) {
proto = bareudp->ethertype; bareudp->dev->stats.rx_dropped++;
} else if (bareudp->multi_proto_mode && (iphdr->version == 6)) { goto drop;
}
ipversion >>= 4;
if (ipversion == 4) {
proto = htons(ETH_P_IP);
} else if (ipversion == 6 && bareudp->multi_proto_mode) {
proto = htons(ETH_P_IPV6); proto = htons(ETH_P_IPV6);
} else { } else {
bareudp->dev->stats.rx_dropped++; bareudp->dev->stats.rx_dropped++;