diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2016-12-09 18:49:24 -0500 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2016-12-09 18:49:24 -0500 |
| commit | aacb6d87890588e839500bcfeabb1fde7bf93e35 (patch) | |
| tree | f5d17c007fde9c021e6aa7b7b761087e93c0ac91 | |
| parent | Linux patch 3.4.113 (diff) | |
| download | linux-patches-aacb6d87890588e839500bcfeabb1fde7bf93e35.tar.gz linux-patches-aacb6d87890588e839500bcfeabb1fde7bf93e35.tar.bz2 linux-patches-aacb6d87890588e839500bcfeabb1fde7bf93e35.zip | |
| -rw-r--r-- | 0000_README | 8 | ||||
| -rw-r--r-- | 1520_fix-race-condition-in-packet-set-ring.patch | 62 |
2 files changed, 66 insertions, 4 deletions
diff --git a/0000_README b/0000_README index 6a446dfe..aa8adeff 100644 --- a/0000_README +++ b/0000_README @@ -495,14 +495,14 @@ Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. -Patch: 1500_selinux-add-SOCK_DIAG_BY_FAMILY-to-the-list-of-netli.patch -From: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=6a96e15096da6e7491107321cfa660c7c2aa119d -Desc: selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types - Patch: 1512_af_key-initialize-satype-in-key_notify_policy_flush.patch From: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=85dfb745ee40232876663ae206cba35f24ab2a40 Desc: af_key: initialize satype in key_notify_policy_flush() +Patch: 1520_fix-race-condition-in-packet-set-ring.patch +From: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=84ac7260236a49c79eede91617700174c2c19b0c +Desc: packet: fix race condition in packet_set_ring. CVE-2016-8655. Bug #601926. + Patch: 1700_correct-bnx2-firware-ver-mips.patch From: https://bugs.gentoo.org/show_bug.cgi?id=424609 Desc: Correct firmware version for bnx2 on mips diff --git a/1520_fix-race-condition-in-packet-set-ring.patch b/1520_fix-race-condition-in-packet-set-ring.patch new file mode 100644 index 00000000..d85527f0 --- /dev/null +++ b/1520_fix-race-condition-in-packet-set-ring.patch @@ -0,0 +1,62 @@ +--- a/net/packet/af_packet.c 2016-12-07 18:10:25.785812861 -0500 ++++ b/net/packet/af_packet.c 2016-12-07 18:18:45.597933525 -0500 +@@ -3648,19 +3648,25 @@ packet_setsockopt(struct socket *sock, i + + if (optlen != sizeof(val)) + return -EINVAL; +- if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) +- return -EBUSY; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; + switch (val) { + case TPACKET_V1: + case TPACKET_V2: + case TPACKET_V3: +- po->tp_version = val; +- return 0; ++ break; + default: + return -EINVAL; + } ++ lock_sock(sk); ++ if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) { ++ ret = -EBUSY; ++ } else { ++ po->tp_version = val; ++ ret = 0; ++ } ++ release_sock(sk); ++ return ret; + } + case PACKET_RESERVE: + { +@@ -4164,6 +4170,7 @@ static int packet_set_ring(struct sock * + /* Added to avoid minimal code churn */ + struct tpacket_req *req = &req_u->req; + ++ lock_sock(sk); + /* Opening a Tx-ring is NOT supported in TPACKET_V3 */ + if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) { + net_warn_ratelimited("Tx-ring is not supported.\n"); +@@ -4245,8 +4252,6 @@ static int packet_set_ring(struct sock * + goto out; + } + +- lock_sock(sk); +- + /* Detach socket from network */ + spin_lock(&po->bind_lock); + was_running = po->running; +@@ -4294,11 +4299,11 @@ static int packet_set_ring(struct sock * + if (!tx_ring) + prb_shutdown_retire_blk_timer(po, rb_queue); + } +- release_sock(sk); + + if (pg_vec) + free_pg_vec(pg_vec, order, req->tp_block_nr); + out: ++ release_sock(sk); + return err; + } + |