From 32d48c8166aa542aab7f7d31cdc6e1a8fcd4e878 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 18 Apr 2017 09:15:04 -0500 Subject: Linux v4.10.11 --- CVE-2017-7308.patch | 107 ---------------------------------------------------- kernel.spec | 8 ++-- sources | 2 +- 3 files changed, 5 insertions(+), 112 deletions(-) delete mode 100644 CVE-2017-7308.patch 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 -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 -Acked-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - 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 -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 -Acked-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - 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 -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 -Acked-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - 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 - diff --git a/kernel.spec b/kernel.spec index 4b9327966..d089eba1a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 10 +%define stable_update 11 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -616,9 +616,6 @@ Patch863: rhbz_1441310.patch # CVE-2017-7618 rhbz 1441095 1441093 Patch865: CVE-2017-7618.patch -# CVE-2017-7308 rhbz 1437404 1437406 -Patch866: CVE-2017-7308.patch - # END OF PATCH DEFINITIONS %endif @@ -2188,6 +2185,9 @@ fi # # %changelog +* Tue Apr 18 2017 Justin M. Forbes - 4.10.11-100 +- Linux v4.10.11 + * Wed Apr 12 2017 Justin M. Forbes - 4.10.10-100 - Linux v4.10.10 - CVE-2017-7616 (rhbz 1441088 1441093) diff --git a/sources b/sources index 3e1d074ac..4836a3572 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 -SHA512 (patch-4.10.10.xz) = 264d156d7a3b1f3b3a80a7a9dc9a358b5cd582d8d894c482f3c9eb5af4eca64439720d5b9b141ae57f7845dfab59563497faae8e6fb666aeec86aab6b8df904a +SHA512 (patch-4.10.11.xz) = a3515be12639f12c4433c122615e841eea4a70ae1557eb305f9c175ae2fec16439a34f3a79a4d1976c19b4068bf6ff1a7b75ff600c9b6c467cfa0edb1f24fdab -- cgit