From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
James Bottomley <James.Bottomley@suse.de>
Subject: [19/29] SCSI: enclosure: fix oops while iterating enclosure_status array
Date: Fri, 22 Jan 2010 16:10:03 -0800 [thread overview]
Message-ID: <20100123001112.646965152@mini.kroah.org> (raw)
In-Reply-To: <20100123001145.GA7391@kroah.com>
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: James Bottomley <James.Bottomley@suse.de>
commit cc9b2e9f6603190c009e5d2629ce8e3f99571346 upstream.
Based on patch originally by Jeff Mahoney <jeffm@suse.com>
enclosure_status is expected to be a NULL terminated array of strings
but isn't actually NULL terminated. When writing an invalid value to
/sys/class/enclosure/.../.../status, it goes off the end of the array
and Oopses.
Fix by making the assumption true and adding NULL at the end.
Reported-by: Artur Wojcik <artur.wojcik@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/misc/enclosure.c | 1 +
include/linux/enclosure.h | 2 ++
2 files changed, 3 insertions(+)
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -391,6 +391,7 @@ static const char *const enclosure_statu
[ENCLOSURE_STATUS_NOT_INSTALLED] = "not installed",
[ENCLOSURE_STATUS_UNKNOWN] = "unknown",
[ENCLOSURE_STATUS_UNAVAILABLE] = "unavailable",
+ [ENCLOSURE_STATUS_MAX] = NULL,
};
static const char *const enclosure_type [] = {
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -42,6 +42,8 @@ enum enclosure_status {
ENCLOSURE_STATUS_NOT_INSTALLED,
ENCLOSURE_STATUS_UNKNOWN,
ENCLOSURE_STATUS_UNAVAILABLE,
+ /* last element for counting purposes */
+ ENCLOSURE_STATUS_MAX
};
/* SFF-8485 activity light settings */
next prev parent reply other threads:[~2010-01-23 0:19 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-23 0:11 [00/29] 2.6.32.6 stable review Greg KH
2010-01-23 0:09 ` [01/29] x86, msr/cpuid: Register enough minors for the MSR and CPUID drivers Greg KH
2010-01-23 0:09 ` [02/29] V4L/DVB (13900): gspca - sunplus: Fix bridge exchanges Greg KH
2010-01-23 0:09 ` [03/29] Staging: asus_oled: fix oops in 2.6.32.2 Greg KH
2010-01-23 0:09 ` [04/29] Staging: hv: fix smp problems in the hyperv core code Greg KH
2010-01-23 0:09 ` [05/29] tty: fix race in tty_fasync Greg KH
2010-01-23 0:09 ` [06/29] ecryptfs: use after free Greg KH
2010-01-23 0:09 ` [07/29] ecryptfs: initialize private persistent file before dereferencing pointer Greg KH
2010-01-23 0:09 ` [08/29] nozomi: quick fix for the close/close bug Greg KH
2010-01-23 0:09 ` [09/29] serial: 8250_pnp: use wildcard for serial Wacom tablets Greg KH
2010-01-23 0:09 ` [10/29] usb: serial: fix memory leak in generic driver Greg KH
2010-01-23 0:09 ` [11/29] USB: fix bitmask merge error Greg KH
2010-01-23 0:09 ` [12/29] USB: Dont use GFP_KERNEL while we cannot reset a storage device Greg KH
2010-01-23 0:09 ` [13/29] USB: EHCI: fix handling of unusual interrupt intervals Greg KH
2010-01-23 0:09 ` [14/29] USB: EHCI & UHCI: fix race between root-hub suspend and port resume Greg KH
2010-01-23 0:09 ` [15/29] USB: add missing delay during remote wakeup Greg KH
2010-01-23 0:10 ` [16/29] USB: add speed values for USB 3.0 and wireless controllers Greg KH
2010-01-23 0:10 ` [17/29] ACPI: EC: Accelerate query execution Greg KH
2010-01-23 0:10 ` [18/29] ACPI: EC: Add wait for irq storm Greg KH
2010-01-23 0:10 ` Greg KH [this message]
2010-01-23 0:10 ` [20/29] drm/i915: Read the response after issuing DDC bus switch command Greg KH
2010-01-23 0:10 ` [21/29] drm/i915: try another possible DDC bus for the SDVO device with multiple outputs Greg KH
2010-01-23 0:10 ` [22/29] block: bdev_stack_limits wrapper Greg KH
2010-01-23 0:10 ` [23/29] DM: Fix device mapper topology stacking Greg KH
2010-01-23 0:10 ` [24/29] x86/PCI/PAT: return EINVAL for pci mmap WC request for !pat_enabled Greg KH
2010-01-23 0:10 ` [25/29] USB: fix usbstorage for 2770:915d delivers no FAT Greg KH
2010-01-23 2:43 ` [Stable-review] " Ben Hutchings
2010-01-23 6:05 ` Greg KH
2010-01-23 0:10 ` [26/29] vmalloc: remove BUG_ON due to racy counting of VM_LAZY_FREE Greg KH
2010-01-23 0:10 ` [27/29] perf timechart: Use tid not pid for COMM change Greg KH
2010-01-23 0:10 ` [28/29] perf events: Dont report side-band events on each cpu for per-task-per-cpu events Greg KH
2010-01-23 11:38 ` [Stable-review] " Stefan Bader
2010-01-23 15:33 ` Greg KH
2010-01-25 18:04 ` Greg KH
2010-01-23 0:10 ` [29/29] perf: Honour event state for aux stream data Greg KH
2010-01-24 7:21 ` [stable] [00/29] 2.6.32.6 stable review Andrew Morton
2010-01-24 16:29 ` Thomas Gleixner
2010-01-25 8:40 ` Ozan Çağlayan
2010-01-25 17:16 ` Greg KH
2010-01-25 17:39 ` Ozan Çağlayan
2010-01-25 17:46 ` Greg KH
2010-01-25 19:09 ` Greg KH
2010-01-25 18:22 ` Thomas Gleixner
2010-01-25 17:15 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100123001112.646965152@mini.kroah.org \
--to=gregkh@suse.de \
--cc=James.Bottomley@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome