4.8-stable patches

added patches:
	bluetooth-add-a-new-04ca-3011-qca_rome-device.patch
	ima-use-file_dentry.patch

diff --git a/queue-4.8/bluetooth-add-a-new-04ca-3011-qca_rome-device.patch b/queue-4.8/bluetooth-add-a-new-04ca-3011-qca_rome-device.patch
new file mode 100644 (file)
index 0000000..f33211a
--- /dev/null
+++ b/queue-4.8/bluetooth-add-a-new-04ca-3011-qca_rome-device.patch
@@ -0,0 +1,36 @@
+From 1144a4eed04b2c3e7d20146d1b76f7669b55971d Mon Sep 17 00:00:00 2001
+From: Dmitry Tunin <hanipouspilot@gmail.com>
+Date: Wed, 21 Sep 2016 19:13:08 +0300
+Subject: Bluetooth: Add a new 04ca:3011 QCA_ROME device
+
+From: Dmitry Tunin <hanipouspilot@gmail.com>
+
+commit 1144a4eed04b2c3e7d20146d1b76f7669b55971d upstream.
+
+BugLink: https://bugs.launchpad.net/bugs/1535802
+
+T:  Bus=01 Lev=02 Prnt=02 Port=04 Cnt=01 Dev#=  3 Spd=12  MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=04ca ProdID=3011 Rev=00.01
+C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/btusb.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -251,6 +251,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME },
+       { USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },
+       { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },
++      { USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME },
+ 
+       /* Broadcom BCM2035 */
+       { USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },

diff --git a/queue-4.8/ima-use-file_dentry.patch b/queue-4.8/ima-use-file_dentry.patch
new file mode 100644 (file)
index 0000000..8d72f35
--- /dev/null
+++ b/queue-4.8/ima-use-file_dentry.patch
@@ -0,0 +1,54 @@
+From e71b9dff0634edb127f449e076e883ef24a8c76c Mon Sep 17 00:00:00 2001
+From: Miklos Szeredi <mszeredi@redhat.com>
+Date: Fri, 16 Sep 2016 12:44:20 +0200
+Subject: ima: use file_dentry()
+
+From: Miklos Szeredi <mszeredi@redhat.com>
+
+commit e71b9dff0634edb127f449e076e883ef24a8c76c upstream.
+
+Ima tries to call ->setxattr() on overlayfs dentry after having locked
+underlying inode, which results in a deadlock.
+
+Reported-by: Krisztian Litkey <kli@iki.fi>
+Fixes: 4bacc9c9234c ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
+Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
+Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/integrity/ima/ima_appraise.c |    4 ++--
+ security/integrity/ima/ima_main.c     |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/security/integrity/ima/ima_appraise.c
++++ b/security/integrity/ima/ima_appraise.c
+@@ -190,7 +190,7 @@ int ima_appraise_measurement(enum ima_ho
+ {
+       static const char op[] = "appraise_data";
+       char *cause = "unknown";
+-      struct dentry *dentry = file->f_path.dentry;
++      struct dentry *dentry = file_dentry(file);
+       struct inode *inode = d_backing_inode(dentry);
+       enum integrity_status status = INTEGRITY_UNKNOWN;
+       int rc = xattr_len, hash_start = 0;
+@@ -295,7 +295,7 @@ out:
+  */
+ void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file)
+ {
+-      struct dentry *dentry = file->f_path.dentry;
++      struct dentry *dentry = file_dentry(file);
+       int rc = 0;
+ 
+       /* do not collect and update hash for digital signatures */
+--- a/security/integrity/ima/ima_main.c
++++ b/security/integrity/ima/ima_main.c
+@@ -228,7 +228,7 @@ static int process_measurement(struct fi
+       if ((action & IMA_APPRAISE_SUBMASK) ||
+                   strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) != 0)
+               /* read 'security.ima' */
+-              xattr_len = ima_read_xattr(file->f_path.dentry, &xattr_value);
++              xattr_len = ima_read_xattr(file_dentry(file), &xattr_value);
+ 
+       hash_algo = ima_get_hash_algo(xattr_value, xattr_len);
+ 

diff --git a/queue-4.8/series b/queue-4.8/series
index 858ec97166b8d23af09044f9a0d464250153716d..788858a93fe3d372aeca8127c5db215f76ea248b 100644 (file)
--- a/queue-4.8/series
+++ b/queue-4.8/series
@@ -31,3 +31,5 @@ arm-dts-mvebu-armada-390-add-missing-compatibility-string-and-bracket.patch
 arm-dts-msm8064-remove-flags-from-spmi-mpp-irqs.patch
 arm-dts-msm8660-remove-flags-from-spmi-mpp-irqs.patch
 arm-cpuidle-fix-error-return-code.patch
+bluetooth-add-a-new-04ca-3011-qca_rome-device.patch
+ima-use-file_dentry.patch