From: Greg Kroah-Hartman Date: Wed, 10 Apr 2013 16:43:39 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.73~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2725a1698c0ac8692befb0b6c1a323782b6df57d;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: block-avoid-using-uninitialized-value-in-from-queue_var_store.patch --- diff --git a/queue-3.0/block-avoid-using-uninitialized-value-in-from-queue_var_store.patch b/queue-3.0/block-avoid-using-uninitialized-value-in-from-queue_var_store.patch new file mode 100644 index 00000000000..dd6e2ef4b5c --- /dev/null +++ b/queue-3.0/block-avoid-using-uninitialized-value-in-from-queue_var_store.patch @@ -0,0 +1,39 @@ +From c678ef5286ddb5cf70384ad5af286b0afc9b73e1 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 3 Apr 2013 21:53:57 +0200 +Subject: block: avoid using uninitialized value in from queue_var_store + +From: Arnd Bergmann + +commit c678ef5286ddb5cf70384ad5af286b0afc9b73e1 upstream. + +As found by gcc-4.8, the QUEUE_SYSFS_BIT_FNS macro creates functions +that use a value generated by queue_var_store independent of whether +that value was set or not. + +block/blk-sysfs.c: In function 'queue_store_nonrot': +block/blk-sysfs.c:244:385: warning: 'val' may be used uninitialized in this function [-Wmaybe-uninitialized] + +Unlike most other such warnings, this one is not a false positive, +writing any non-number string into the sysfs files indeed has +an undefined result, rather than returning an error. + +Signed-off-by: Arnd Bergmann +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + block/blk-sysfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/block/blk-sysfs.c ++++ b/block/blk-sysfs.c +@@ -200,6 +200,8 @@ queue_store_##name(struct request_queue + unsigned long val; \ + ssize_t ret; \ + ret = queue_var_store(&val, page, count); \ ++ if (ret < 0) \ ++ return ret; \ + if (neg) \ + val = !val; \ + \ diff --git a/queue-3.0/series b/queue-3.0/series index 5a973a97617..09f32fd8fbd 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -11,3 +11,4 @@ ftrace-consistently-restore-trace-function-on-sysctl-enabling.patch powerpc-pseries_lpar_hpte_remove-fails-from-adjunct-partition-being-performed-before-the-andcond-test.patch spinlocks-and-preemption-points-need-to-be-at-least-compiler-barriers.patch crypto-gcm-fix-assumption-that-assoc-has-one-segment.patch +block-avoid-using-uninitialized-value-in-from-queue_var_store.patch