aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalvatore Bonaccorso <carnil@debian.org>2020-09-05 00:10:24 +0200
committerSalvatore Bonaccorso <carnil@debian.org>2020-09-05 00:10:24 +0200
commitadf878615e7f0a50356cafd628385535bc441a17 (patch)
tree3bfe42614c50e5c903737e9552914a962bb9e6c1
parent609823cd869a0856c7a7a7b138d88cc1663e7588 (diff)
downloadkernel_replicant_linux-adf878615e7f0a50356cafd628385535bc441a17.tar.gz
kernel_replicant_linux-adf878615e7f0a50356cafd628385535bc441a17.tar.bz2
kernel_replicant_linux-adf878615e7f0a50356cafd628385535bc441a17.zip
Sync "net/packet: fix overflow in tpacket_rcv" with upstream
Gbp-Dch: Ignore
-rw-r--r--debian/patches/bugfix/all/net-packet-fix-overflow-in-tpacket_rcv.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/patches/bugfix/all/net-packet-fix-overflow-in-tpacket_rcv.patch b/debian/patches/bugfix/all/net-packet-fix-overflow-in-tpacket_rcv.patch
index 398fd399224d..d7b45e77364f 100644
--- a/debian/patches/bugfix/all/net-packet-fix-overflow-in-tpacket_rcv.patch
+++ b/debian/patches/bugfix/all/net-packet-fix-overflow-in-tpacket_rcv.patch
@@ -1,7 +1,7 @@
From: Or Cohen <orcohen@paloaltonetworks.com>
Date: Thu, 3 Sep 2020 21:05:28 -0700
Subject: net/packet: fix overflow in tpacket_rcv
-Origin: https://lore.kernel.org/netdev/20200904040528.3635711-1-edumazet@google.com/
+Origin: https://git.kernel.org/linus/acf69c946233259ab4d64f8869d4037a198c7f06
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2020-14386
Using tp_reserve to calculate netoff can overflow as
@@ -20,6 +20,7 @@ This addresses CVE-2020-14386
Fixes: 8913336a7e8d ("packet: add PACKET_RESERVE sockopt")
Signed-off-by: Or Cohen <orcohen@paloaltonetworks.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
net/packet/af_packet.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)