[pve-devel] applied: [PATCH kernel 2/4] drop patches applied upstream
Fabian Grünbichler
f.gruenbichler at proxmox.com
Thu Dec 22 15:22:06 CET 2016
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
Makefile | 2 -
CVE-2016-8655-packet-fix-race-condition.patch | 92 --------
...llow-adding-VLANs-while-interface-is-down.patch | 254 ---------------------
3 files changed, 348 deletions(-)
delete mode 100644 CVE-2016-8655-packet-fix-race-condition.patch
delete mode 100644 bnx2x-allow-adding-VLANs-while-interface-is-down.patch
diff --git a/Makefile b/Makefile
index df9a272..567bf4f 100644
--- a/Makefile
+++ b/Makefile
@@ -267,8 +267,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch
# IPoIB performance regression fix
cd ${KERNEL_SRC}; patch -p1 < ../IB-ipoib-move-back-the-IB-LL-address-into-the-hard-header.patch
- cd ${KERNEL_SRC}; patch -p1 < ../bnx2x-allow-adding-VLANs-while-interface-is-down.patch
- cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-8655-packet-fix-race-condition.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
diff --git a/CVE-2016-8655-packet-fix-race-condition.patch b/CVE-2016-8655-packet-fix-race-condition.patch
deleted file mode 100644
index 6c62ed4..0000000
--- a/CVE-2016-8655-packet-fix-race-condition.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 84ac7260236a49c79eede91617700174c2c19b0c Mon Sep 17 00:00:00 2001
-From: Philip Pettersson <philip.pettersson at gmail.com>
-Date: Wed, 30 Nov 2016 14:55:36 -0800
-Subject: packet: fix race condition in packet_set_ring
-
-When packet_set_ring creates a ring buffer it will initialize a
-struct timer_list if the packet version is TPACKET_V3. This value
-can then be raced by a different thread calling setsockopt to
-set the version to TPACKET_V1 before packet_set_ring has finished.
-
-This leads to a use-after-free on a function pointer in the
-struct timer_list when the socket is closed as the previously
-initialized timer will not be deleted.
-
-The bug is fixed by taking lock_sock(sk) in packet_setsockopt when
-changing the packet version while also taking the lock at the start
-of packet_set_ring.
-
-Fixes: f6fb8f100b80 ("af-packet: TPACKET_V3 flexible buffer implementation.")
-Signed-off-by: Philip Pettersson <philip.pettersson at gmail.com>
-Signed-off-by: Eric Dumazet <edumazet at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- net/packet/af_packet.c | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index d2238b2..dd23323 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -3648,19 +3648,25 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
-
- 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 *sk, union tpacket_req_u *req_u,
- /* 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,7 +4252,6 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
- goto out;
- }
-
-- lock_sock(sk);
-
- /* Detach socket from network */
- spin_lock(&po->bind_lock);
-@@ -4294,11 +4300,11 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
- 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;
- }
-
---
-cgit v0.12
-
diff --git a/bnx2x-allow-adding-VLANs-while-interface-is-down.patch b/bnx2x-allow-adding-VLANs-while-interface-is-down.patch
deleted file mode 100644
index b3f0de4..0000000
--- a/bnx2x-allow-adding-VLANs-while-interface-is-down.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From a02cc9d3cc9f98905df214d4a57e5918473260ea Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt at redhat.com>
-Date: Fri, 3 Jun 2016 15:32:18 +0200
-Subject: [PATCH] bnx2x: allow adding VLANs while interface is down
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since implementing VLAN filtering in commit 05cc5a39ddb74
-("bnx2x: add vlan filtering offload") bnx2x refuses to add a VLAN while
-the interface is down:
-
- # ip link add link enp3s0f0 enp3s0f0_10 type vlan id 10
- RTNETLINK answers: Bad address
-
-and in dmesg (with bnx2x.debug=0x20):
- bnx2x: [bnx2x_vlan_rx_add_vid:12941(enp3s0f0)]Ignoring VLAN
- configuration the interface is down
-
-Other drivers have no problem with this.
-Fix this peculiar behavior in the following way:
- - Accept requests to add/kill VID regardless of the device state.
- Maintain the requested list of VIDs in the bp->vlan_reg list.
- - If the device is up, try to configure the VID list into the hardware.
- If we run out of VLAN credits or encounter a failure configuring an
- entry, fall back to accepting all VLANs.
- If we successfully configure all entries from the list, turn the
- fallback off.
- - Use the same code for reconfiguring VLANs during NIC load.
-
-Signed-off-by: Michal Schmidt <mschmidt at redhat.com>
-Acked-by: Yuval Mintz <Yuval.Mintz at qlogic.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
----
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 151 ++++++++++-------------
- 1 file changed, 62 insertions(+), 89 deletions(-)
-
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-index c5fe9158..a59d55e 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-@@ -12895,52 +12895,71 @@ static int __bnx2x_vlan_configure_vid(struct bnx2x *bp, u16 vid, bool add)
- return rc;
- }
-
--int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp)
-+static int bnx2x_vlan_configure_vid_list(struct bnx2x *bp)
- {
- struct bnx2x_vlan_entry *vlan;
- int rc = 0;
-
-- if (!bp->vlan_cnt) {
-- DP(NETIF_MSG_IFUP, "No need to re-configure vlan filters\n");
-- return 0;
-- }
--
-+ /* Configure all non-configured entries */
- list_for_each_entry(vlan, &bp->vlan_reg, link) {
-- /* Prepare for cleanup in case of errors */
-- if (rc) {
-- vlan->hw = false;
-- continue;
-- }
--
-- if (!vlan->hw)
-+ if (vlan->hw)
- continue;
-
-- DP(NETIF_MSG_IFUP, "Re-configuring vlan 0x%04x\n", vlan->vid);
-+ if (bp->vlan_cnt >= bp->vlan_credit)
-+ return -ENOBUFS;
-
- rc = __bnx2x_vlan_configure_vid(bp, vlan->vid, true);
- if (rc) {
-- BNX2X_ERR("Unable to configure VLAN %d\n", vlan->vid);
-- vlan->hw = false;
-- rc = -EINVAL;
-- continue;
-+ BNX2X_ERR("Unable to config VLAN %d\n", vlan->vid);
-+ return rc;
- }
-+
-+ DP(NETIF_MSG_IFUP, "HW configured for VLAN %d\n", vlan->vid);
-+ vlan->hw = true;
-+ bp->vlan_cnt++;
- }
-
-- return rc;
-+ return 0;
-+}
-+
-+static void bnx2x_vlan_configure(struct bnx2x *bp, bool set_rx_mode)
-+{
-+ bool need_accept_any_vlan;
-+
-+ need_accept_any_vlan = !!bnx2x_vlan_configure_vid_list(bp);
-+
-+ if (bp->accept_any_vlan != need_accept_any_vlan) {
-+ bp->accept_any_vlan = need_accept_any_vlan;
-+ DP(NETIF_MSG_IFUP, "Accept all VLAN %s\n",
-+ bp->accept_any_vlan ? "raised" : "cleared");
-+ if (set_rx_mode) {
-+ if (IS_PF(bp))
-+ bnx2x_set_rx_mode_inner(bp);
-+ else
-+ bnx2x_vfpf_storm_rx_mode(bp);
-+ }
-+ }
-+}
-+
-+int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp)
-+{
-+ struct bnx2x_vlan_entry *vlan;
-+
-+ /* The hw forgot all entries after reload */
-+ list_for_each_entry(vlan, &bp->vlan_reg, link)
-+ vlan->hw = false;
-+ bp->vlan_cnt = 0;
-+
-+ /* Don't set rx mode here. Our caller will do it. */
-+ bnx2x_vlan_configure(bp, false);
-+
-+ return 0;
- }
-
- static int bnx2x_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
- {
- struct bnx2x *bp = netdev_priv(dev);
- struct bnx2x_vlan_entry *vlan;
-- bool hw = false;
-- int rc = 0;
--
-- if (!netif_running(bp->dev)) {
-- DP(NETIF_MSG_IFUP,
-- "Ignoring VLAN configuration the interface is down\n");
-- return -EFAULT;
-- }
-
- DP(NETIF_MSG_IFUP, "Adding VLAN %d\n", vid);
-
-@@ -12948,93 +12967,47 @@ static int bnx2x_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
- if (!vlan)
- return -ENOMEM;
-
-- bp->vlan_cnt++;
-- if (bp->vlan_cnt > bp->vlan_credit && !bp->accept_any_vlan) {
-- DP(NETIF_MSG_IFUP, "Accept all VLAN raised\n");
-- bp->accept_any_vlan = true;
-- if (IS_PF(bp))
-- bnx2x_set_rx_mode_inner(bp);
-- else
-- bnx2x_vfpf_storm_rx_mode(bp);
-- } else if (bp->vlan_cnt <= bp->vlan_credit) {
-- rc = __bnx2x_vlan_configure_vid(bp, vid, true);
-- hw = true;
-- }
--
- vlan->vid = vid;
-- vlan->hw = hw;
-+ vlan->hw = false;
-+ list_add_tail(&vlan->link, &bp->vlan_reg);
-
-- if (!rc) {
-- list_add(&vlan->link, &bp->vlan_reg);
-- } else {
-- bp->vlan_cnt--;
-- kfree(vlan);
-- }
--
-- DP(NETIF_MSG_IFUP, "Adding VLAN result %d\n", rc);
-+ if (netif_running(dev))
-+ bnx2x_vlan_configure(bp, true);
-
-- return rc;
-+ return 0;
- }
-
- static int bnx2x_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
- {
- struct bnx2x *bp = netdev_priv(dev);
- struct bnx2x_vlan_entry *vlan;
-+ bool found = false;
- int rc = 0;
-
-- if (!netif_running(bp->dev)) {
-- DP(NETIF_MSG_IFUP,
-- "Ignoring VLAN configuration the interface is down\n");
-- return -EFAULT;
-- }
--
- DP(NETIF_MSG_IFUP, "Removing VLAN %d\n", vid);
-
-- if (!bp->vlan_cnt) {
-- BNX2X_ERR("Unable to kill VLAN %d\n", vid);
-- return -EINVAL;
-- }
--
- list_for_each_entry(vlan, &bp->vlan_reg, link)
-- if (vlan->vid == vid)
-+ if (vlan->vid == vid) {
-+ found = true;
- break;
-+ }
-
-- if (vlan->vid != vid) {
-+ if (!found) {
- BNX2X_ERR("Unable to kill VLAN %d - not found\n", vid);
- return -EINVAL;
- }
-
-- if (vlan->hw)
-+ if (netif_running(dev) && vlan->hw) {
- rc = __bnx2x_vlan_configure_vid(bp, vid, false);
-+ DP(NETIF_MSG_IFUP, "HW deconfigured for VLAN %d\n", vid);
-+ bp->vlan_cnt--;
-+ }
-
- list_del(&vlan->link);
- kfree(vlan);
-
-- bp->vlan_cnt--;
--
-- if (bp->vlan_cnt <= bp->vlan_credit && bp->accept_any_vlan) {
-- /* Configure all non-configured entries */
-- list_for_each_entry(vlan, &bp->vlan_reg, link) {
-- if (vlan->hw)
-- continue;
--
-- rc = __bnx2x_vlan_configure_vid(bp, vlan->vid, true);
-- if (rc) {
-- BNX2X_ERR("Unable to config VLAN %d\n",
-- vlan->vid);
-- continue;
-- }
-- DP(NETIF_MSG_IFUP, "HW configured for VLAN %d\n",
-- vlan->vid);
-- vlan->hw = true;
-- }
-- DP(NETIF_MSG_IFUP, "Accept all VLAN Removed\n");
-- bp->accept_any_vlan = false;
-- if (IS_PF(bp))
-- bnx2x_set_rx_mode_inner(bp);
-- else
-- bnx2x_vfpf_storm_rx_mode(bp);
-- }
-+ if (netif_running(dev))
-+ bnx2x_vlan_configure(bp, true);
-
- DP(NETIF_MSG_IFUP, "Removing VLAN result %d\n", rc);
-
---
-2.1.4
-
--
2.1.4
More information about the pve-devel
mailing list