diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-04-11 22:10:44 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-04-11 22:10:44 -0400 |
| commit | 2071c8034fdba6c9cb3c650ab273a9400e79642d (patch) | |
| tree | 4c4844281adfb4830a47424e2d537a286e462b64 | |
| parent | 90cb503d840ba56990be8c90c0d7436e61ee4768 (diff) | |
| download | longterm-queue-2.6.34-2071c8034fdba6c9cb3c650ab273a9400e79642d.tar.gz | |
staging: Frontier - separate into upstream commits
De-bundle the two commits into their constituent upstream bits so
that the audit and check scripts don't get confused.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Staging-frontier-fix-up-my-fixup-for-some-sysfs-attr.patch | 32 | ||||
| -rw-r--r-- | queue/Staging-frontier-fix-up-some-sysfs-attribute-permiss.patch | 21 | ||||
| -rw-r--r-- | queue/series | 1 |
3 files changed, 42 insertions, 12 deletions
diff --git a/queue/Staging-frontier-fix-up-my-fixup-for-some-sysfs-attr.patch b/queue/Staging-frontier-fix-up-my-fixup-for-some-sysfs-attr.patch new file mode 100644 index 0000000..f5f46f5 --- /dev/null +++ b/queue/Staging-frontier-fix-up-my-fixup-for-some-sysfs-attr.patch @@ -0,0 +1,32 @@ +From 2a767fda5d0d8dcff465724dfad6ee131489b3f2 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@suse.de> +Date: Thu, 18 Nov 2010 11:21:04 -0800 +Subject: [PATCH] Staging: frontier: fix up my fixup for some sysfs attribute + permissions + +commit 2a767fda5d0d8dcff465724dfad6ee131489b3f2 upstream. + +They should be writable by root, not readable. +Doh, stupid me with the wrong flags. + +Reported-by: Jonathan Cameron <jic23@cam.ac.uk> +Cc: David Taht <d@teklibre.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c +index 1611a27..8894ab1 100644 +--- a/drivers/staging/frontier/tranzport.c ++++ b/drivers/staging/frontier/tranzport.c +@@ -204,7 +204,7 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev) + t->value = temp; \ + return count; \ + } \ +- static DEVICE_ATTR(value, S_IRUSR | S_IRUGO, show_##value, set_##value); ++ static DEVICE_ATTR(value, S_IWUSR | S_IRUGO, show_##value, set_##value); + + show_int(enable); + show_int(offline); +-- +1.7.4.4 + diff --git a/queue/Staging-frontier-fix-up-some-sysfs-attribute-permiss.patch b/queue/Staging-frontier-fix-up-some-sysfs-attribute-permiss.patch index 765ba21..76542c2 100644 --- a/queue/Staging-frontier-fix-up-some-sysfs-attribute-permiss.patch +++ b/queue/Staging-frontier-fix-up-some-sysfs-attribute-permiss.patch @@ -1,12 +1,9 @@ -From d7980a1006721d2da45955526d45adcf711fb2b9 Mon Sep 17 00:00:00 2001 +From 3bad28ec006ad6ab2bca4e5103860b75391e3c9d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@suse.de> Date: Tue, 16 Nov 2010 11:18:33 -0800 Subject: [PATCH] Staging: frontier: fix up some sysfs attribute permissions -commit 2b9e50d0460818638a84ee1ba267b765098e1808 upstream. - -commit 3bad28ec006ad6ab2bca4e5103860b75391e3c9d and -2a767fda5d0d8dcff465724dfad6ee131489b3f2 upstream merged together. +commit 3bad28ec006ad6ab2bca4e5103860b75391e3c9d upstream. They should not be writable by any user @@ -16,15 +13,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c -index 2f03f43..9d60e92 100644 +index a145a15..1611a27 100644 --- a/drivers/staging/frontier/tranzport.c +++ b/drivers/staging/frontier/tranzport.c -@@ -202,7 +202,7 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev) - t->value = temp; \ - return count; \ - } \ -- static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); -+ static DEVICE_ATTR(value, S_IWUSR | S_IRUGO, show_##value, set_##value); +@@ -204,7 +204,7 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev) + t->value = temp; \ + return count; \ + } \ +- static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); ++ static DEVICE_ATTR(value, S_IRUSR | S_IRUGO, show_##value, set_##value); show_int(enable); show_int(offline); diff --git a/queue/series b/queue/series index 73c1129..23b4924 100644 --- a/queue/series +++ b/queue/series @@ -107,6 +107,7 @@ perf_events-Fix-perf_counter_mmap-hook-in-mprotect.patch ARM-6489-1-thumb2-fix-incorrect-optimisation-in-usra.patch ARM-6482-2-Fix-find_next_zero_bit-and-related-assemb.patch Staging-frontier-fix-up-some-sysfs-attribute-permiss.patch +Staging-frontier-fix-up-my-fixup-for-some-sysfs-attr.patch staging-rtl8187se-Change-panic-to-warn-when-RF-switc.patch net-sched-fix-kernel-leak-in-act_police.patch HID-hidraw-fix-a-NULL-pointer-dereference-in-hidraw_.patch |