diff options
Diffstat (limited to 'CVE-2017-7308.patch')
| -rw-r--r-- | CVE-2017-7308.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/CVE-2017-7308.patch b/CVE-2017-7308.patch deleted file mode 100644 index c257f9564..000000000 --- a/CVE-2017-7308.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 2b6867c2ce76c596676bec7d2d525af525fdc6e2 Mon Sep 17 00:00:00 2001 -From: Andrey Konovalov <andreyknvl@google.com> -Date: Wed, 29 Mar 2017 16:11:20 +0200 -Subject: [PATCH] net/packet: fix overflow in check for priv area size - -Subtracting tp_sizeof_priv from tp_block_size and casting to int -to check whether one is less then the other doesn't always work -(both of them are unsigned ints). - -Compare them as is instead. - -Also cast tp_sizeof_priv to u64 before using BLK_PLUS_PRIV, as -it can overflow inside BLK_PLUS_PRIV otherwise. - -Signed-off-by: Andrey Konovalov <andreyknvl@google.com> -Acked-by: Eric Dumazet <edumazet@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/packet/af_packet.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index a0dbe7c..2323ee3 100644 ---- a/net/packet/af_packet.c -+++ b/net/packet/af_packet.c -@@ -4193,8 +4193,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, - if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) - goto out; - if (po->tp_version >= TPACKET_V3 && -- (int)(req->tp_block_size - -- BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0) -+ req->tp_block_size <= -+ BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv)) - goto out; - if (unlikely(req->tp_frame_size < po->tp_hdrlen + - po->tp_reserve)) --- -2.9.3 - -From 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b Mon Sep 17 00:00:00 2001 -From: Andrey Konovalov <andreyknvl@google.com> -Date: Wed, 29 Mar 2017 16:11:21 +0200 -Subject: [PATCH] net/packet: fix overflow in check for tp_frame_nr - -When calculating rb->frames_per_block * req->tp_block_nr the result -can overflow. - -Add a check that tp_block_size * tp_block_nr <= UINT_MAX. - -Since frames_per_block <= tp_block_size, the expression would -never overflow. - -Signed-off-by: Andrey Konovalov <andreyknvl@google.com> -Acked-by: Eric Dumazet <edumazet@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/packet/af_packet.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 2323ee3..3ac286e 100644 ---- a/net/packet/af_packet.c -+++ b/net/packet/af_packet.c -@@ -4205,6 +4205,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, - rb->frames_per_block = req->tp_block_size / req->tp_frame_size; - if (unlikely(rb->frames_per_block == 0)) - goto out; -+ if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr)) -+ goto out; - if (unlikely((rb->frames_per_block * req->tp_block_nr) != - req->tp_frame_nr)) - goto out; --- -2.9.3 - -From bcc5364bdcfe131e6379363f089e7b4108d35b70 Mon Sep 17 00:00:00 2001 -From: Andrey Konovalov <andreyknvl@google.com> -Date: Wed, 29 Mar 2017 16:11:22 +0200 -Subject: [PATCH] net/packet: fix overflow in check for tp_reserve - -When calculating po->tp_hdrlen + po->tp_reserve the result can overflow. - -Fix by checking that tp_reserve <= INT_MAX on assign. - -Signed-off-by: Andrey Konovalov <andreyknvl@google.com> -Acked-by: Eric Dumazet <edumazet@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/packet/af_packet.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 3ac286e..8489bef 100644 ---- a/net/packet/af_packet.c -+++ b/net/packet/af_packet.c -@@ -3665,6 +3665,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv - return -EBUSY; - if (copy_from_user(&val, optval, sizeof(val))) - return -EFAULT; -+ if (val > INT_MAX) -+ return -EINVAL; - po->tp_reserve = val; - return 0; - } --- -2.9.3 - |