From 43988ee4c0b3a2a59bc80ec75d961651e80c077a Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 7 Dec 2016 09:44:47 -0800 Subject: Linux v4.9-rc8-55-gce779d6 - Disable CONFIG_AF_KCM (rhbz 1402489) --- baseconfig/CONFIG_AF_KCM | 2 +- gitrev | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64-debug.config | 2 +- kernel-ppc64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-ppc64p7-debug.config | 2 +- kernel-ppc64p7.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 9 +-- sources | 2 +- ...from-the-stack-in-virtnet_set_mac_address.patch | 82 ---------------------- 25 files changed, 28 insertions(+), 109 deletions(-) delete mode 100644 virtio-net-Fix-DMA-from-the-stack-in-virtnet_set_mac_address.patch diff --git a/baseconfig/CONFIG_AF_KCM b/baseconfig/CONFIG_AF_KCM index 7c61ccecb..b26e52616 100644 --- a/baseconfig/CONFIG_AF_KCM +++ b/baseconfig/CONFIG_AF_KCM @@ -1 +1 @@ -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set diff --git a/gitrev b/gitrev index 53f46bc23..9081a920e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -d9d04527c79f0f7d9186272866526e871ef4ac6f +ce779d6b5bbe6a32452a882605d09518cc79e4ba diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index ca42d8953..f38ee6200 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -134,7 +134,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index f637b64df..5819f3a70 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -134,7 +134,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 2c2fb5845..43f6022f6 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -119,7 +119,7 @@ CONFIG_AEABI=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 5fa5c10eb..53be415e7 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -119,7 +119,7 @@ CONFIG_AEABI=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 4d2aa7267..f43b69497 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -119,7 +119,7 @@ CONFIG_AEABI=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 24e9b17b8..0c86d38d0 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -119,7 +119,7 @@ CONFIG_AEABI=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 2455c1876..c9acd07a5 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -153,7 +153,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 17f7eddfc..a5a89c493 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -153,7 +153,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index c8cad784c..f8e210cc1 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -153,7 +153,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-i686.config b/kernel-i686.config index 0efdf0eee..1b658ab34 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -153,7 +153,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 3c3c86923..fb6d89d9c 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -120,7 +120,7 @@ CONFIG_ADB=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 6fce121a5..5c971cd4e 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -120,7 +120,7 @@ CONFIG_ADB=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 847db585c..0eed028db 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -117,7 +117,7 @@ CONFIG_ADB_PMU_LED_DISK=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 88ff767f5..5e26dff49 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -117,7 +117,7 @@ CONFIG_ADB_PMU_LED_DISK=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 85d3f0acb..8de8ebafc 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -117,7 +117,7 @@ CONFIG_ADB_PMU_LED_DISK=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index f82492510..ed56a6b14 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -117,7 +117,7 @@ CONFIG_ADB_PMU_LED_DISK=y # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 65b955db9..be7ca27f7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -117,7 +117,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AFIUCV=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-s390x.config b/kernel-s390x.config index ff057f0c4..8dbfc7e8d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -117,7 +117,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AFIUCV=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index b6a3ede51..89f599f66 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -155,7 +155,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 03b948ba7..bab2ac465 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -155,7 +155,7 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4403 is not set # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m -CONFIG_AF_KCM=m +# CONFIG_AF_KCM is not set # CONFIG_AF_RXRPC is not set # CONFIG_AFS_FS is not set CONFIG_AGP_ALI=y diff --git a/kernel.spec b/kernel.spec index 42c205ef9..2dd4b01a6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 8 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -616,9 +616,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #ongoing complaint, full discussion delayed until ksummit/plumbers Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch -#rhbz 1401612 -Patch850: virtio-net-Fix-DMA-from-the-stack-in-virtnet_set_mac_address.patch - # END OF PATCH DEFINITIONS %endif @@ -2171,6 +2168,10 @@ fi # # %changelog +* Wed Dec 07 2016 Laura Abbott - 4.9.0-0.rc8.git2.1 +- Linux v4.9-rc8-55-gce779d6 +- Disable CONFIG_AF_KCM (rhbz 1402489) + * Tue Dec 06 2016 Laura Abbott - 4.9.0-0.rc8.git1.1 - Linux v4.9-rc8-9-gd9d0452 - Fix DMA from stack in virtio-net (rhbz 1401612) diff --git a/sources b/sources index dd9c85159..b627c4f71 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz 0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz 0325bf5c99db7ad4317707afe23aa954 patch-4.9-rc8.xz -8d3883138f338758fd9651ae6259e95b patch-4.9-rc8-git1.xz +502da6835ebdf5a7b53847d78d2cd37d patch-4.9-rc8-git2.xz diff --git a/virtio-net-Fix-DMA-from-the-stack-in-virtnet_set_mac_address.patch b/virtio-net-Fix-DMA-from-the-stack-in-virtnet_set_mac_address.patch deleted file mode 100644 index 1a392f929..000000000 --- a/virtio-net-Fix-DMA-from-the-stack-in-virtnet_set_mac_address.patch +++ /dev/null @@ -1,82 +0,0 @@ -From patchwork Tue Dec 6 02:10:58 2016 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: virtio-net: Fix DMA-from-the-stack in virtnet_set_mac_address() -From: Andy Lutomirski -X-Patchwork-Id: 702984 -X-Patchwork-Delegate: davem@davemloft.net -Message-Id: -To: netdev@vger.kernel.org -Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, - Andy Lutomirski , - "Michael S . Tsirkin" , Jason Wang , - Laura Abbott -Date: Mon, 5 Dec 2016 18:10:58 -0800 - -With CONFIG_VMAP_STACK=y, virtnet_set_mac_address() can be passed a -pointer to the stack and it will OOPS. Copy the address to the heap -to prevent the crash. - -Cc: Michael S. Tsirkin -Cc: Jason Wang -Cc: Laura Abbott -Reported-by: zbyszek@in.waw.pl -Signed-off-by: Andy Lutomirski -Acked-by: Jason Wang -Acked-by: Michael S. Tsirkin ---- - -Very lightly tested. - - drivers/net/virtio_net.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c -index 7276d5a95bd0..cbf1c613c67a 100644 ---- a/drivers/net/virtio_net.c -+++ b/drivers/net/virtio_net.c -@@ -969,12 +969,17 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) - struct virtnet_info *vi = netdev_priv(dev); - struct virtio_device *vdev = vi->vdev; - int ret; -- struct sockaddr *addr = p; -+ struct sockaddr *addr; - struct scatterlist sg; - -- ret = eth_prepare_mac_addr_change(dev, p); -+ addr = kmalloc(sizeof(*addr), GFP_KERNEL); -+ if (!addr) -+ return -ENOMEM; -+ memcpy(addr, p, sizeof(*addr)); -+ -+ ret = eth_prepare_mac_addr_change(dev, addr); - if (ret) -- return ret; -+ goto out; - - if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR)) { - sg_init_one(&sg, addr->sa_data, dev->addr_len); -@@ -982,7 +987,8 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) - VIRTIO_NET_CTRL_MAC_ADDR_SET, &sg)) { - dev_warn(&vdev->dev, - "Failed to set mac address by vq command.\n"); -- return -EINVAL; -+ ret = -EINVAL; -+ goto out; - } - } else if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC) && - !virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) { -@@ -996,8 +1002,11 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) - } - - eth_commit_mac_addr_change(dev, p); -+ ret = 0; - -- return 0; -+out: -+ kfree(addr); -+ return ret; - } - - static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev, -- cgit