From: Greg Kroah-Hartman Date: Mon, 24 Sep 2012 22:12:50 +0000 (-0700) Subject: remove 2 3.0-stable patches that were breaking the build. X-Git-Tag: v3.0.44~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd79354aeb4a87c9c7bb57c879c2ab712e78265f;p=thirdparty%2Fkernel%2Fstable-queue.git remove 2 3.0-stable patches that were breaking the build. queue-3.0/bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch and queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch broke the build. --- diff --git a/queue-3.0/bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch b/queue-3.0/bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch deleted file mode 100644 index f0d687a8a65..00000000000 --- a/queue-3.0/bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b22d8822829c34cff9b4ab4b1a556b5c2955e879 Mon Sep 17 00:00:00 2001 -From: Mathias Krause -Date: Wed, 15 Aug 2012 11:31:48 +0000 -Subject: Bluetooth: RFCOMM - Fix info leak in getsockopt(BT_SECURITY) - - -From: Mathias Krause - -[ Upstream commit 9ad2de43f1aee7e7274a4e0d41465489299e344b ] - -The RFCOMM code fails to initialize the key_size member of struct -bt_security before copying it to userland -- that for leaking one -byte kernel stack. Initialize key_size with 0 to avoid the info -leak. - -Signed-off-by: Mathias Krause -Cc: Marcel Holtmann -Cc: Gustavo Padovan -Cc: Johan Hedberg -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/bluetooth/rfcomm/sock.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/bluetooth/rfcomm/sock.c -+++ b/net/bluetooth/rfcomm/sock.c -@@ -834,6 +834,7 @@ static int rfcomm_sock_getsockopt(struct - } - - sec.level = rfcomm_pi(sk)->sec_level; -+ sec.key_size = 0; - - len = min_t(unsigned int, len, sizeof(sec)); - if (copy_to_user(optval, (char *) &sec, len)) diff --git a/queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch b/queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch deleted file mode 100644 index da42ef428da..00000000000 --- a/queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6dafab6b1383e912cd252fa809570b484eb6e0dc Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Wed, 19 Sep 2012 12:54:22 +1000 -Subject: md: make sure metadata is updated when spares are activated or removed. - -From: NeilBrown - -commit 6dafab6b1383e912cd252fa809570b484eb6e0dc upstream. - -It isn't always necessary to update the metadata when spares are -removed as the presence-or-not of a spare isn't really important to -the integrity of an array. -Also activating a spare doesn't always require updating the metadata -as the update on 'recovery-completed' is usually sufficient. - -However the introduction of 'replacement' devices have made these -transitions sometimes more important. For example the 'Replacement' -flag isn't cleared until the original device is removed, so we need -to ensure a metadata update after that 'spare' is removed. - -So set MD_CHANGE_DEVS whenever a spare is activated or removed, to -complement the current situation where it is set when a spare is added -or a device is failed (or a number of other less common situations). - -This is suitable for -stable as out-of-data metadata could lead -to data corruption. -This is only relevant for 3.3 and later 9when 'replacement' as -introduced. - -Signed-off-by: NeilBrown -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/md/md.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -7139,6 +7139,8 @@ static int remove_and_add_spares(mddev_t - } - } - } -+ if (removed) -+ set_bit(MD_CHANGE_DEVS, &mddev->flags); - return spares; - } - -@@ -7152,9 +7154,11 @@ static void reap_sync_thread(mddev_t *md - !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) { - /* success...*/ - /* activate any spares */ -- if (mddev->pers->spare_active(mddev)) -+ if (mddev->pers->spare_active(mddev)) { - sysfs_notify(&mddev->kobj, NULL, - "degraded"); -+ set_bit(MD_CHANGE_DEVS, &mddev->flags); -+ } - } - if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && - mddev->pers->finish_reshape) diff --git a/queue-3.0/series b/queue-3.0/series index f6b49c4484e..67358200efd 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -10,7 +10,6 @@ atm-fix-info-leak-in-getsockopt-so_atmpvc.patch atm-fix-info-leak-via-getsockname.patch bluetooth-hci-fix-info-leak-in-getsockopt-hci_filter.patch bluetooth-hci-fix-info-leak-via-getsockname.patch -bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch bluetooth-rfcomm-fix-info-leak-in-ioctl-rfcommgetdevlist.patch bluetooth-rfcomm-fix-info-leak-via-getsockname.patch bluetooth-l2cap-fix-info-leak-via-getsockname.patch @@ -43,7 +42,6 @@ ahci-add-alternate-identifier-for-the-88se9172.patch kobject-fix-oops-with-input0-bad-kobj_uevent_env-content-in-show_uevent.patch redefine-atomic_init-and-atomic64_init-to-drop-the-casts.patch md-don-t-truncate-size-at-4tb-for-raid0-and-linear.patch -md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch mm-page_alloc-fix-the-page-address-of-higher-page-s-buddy-calculation.patch drivers-rtc-rtc-twl.c-ensure-all-interrupts-are-disabled-during-probe.patch hwmon-twl4030-madc-hwmon-initialize-uninitialized-structure-elements.patch