p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hpsa: fix multiple issues in path_info_show 

path_info_show() seems to be broken in multiple ways.

First, there's

  817 return snprintf(buf, output_len+1, "%s%s%s%s%s%s%s%s",
  818       path[0], path[1], path[2], path[3],
  819       path[4], path[5], path[6], path[7]);

so hopefully output_len contains the combined length of the eight
strings. Otherwise, snprintf will stop copying to the output
buffer, but still end up reporting that combined length - which
in turn would result in user-space getting a bunch of useless nul
bytes (thankfully the upper sysfs layer seems to clear the output
buffer before passing it to the various ->show routines). But we have

  767      output_len = snprintf(path[i],
  768                       PATH_STRING_LEN, "[%d:%d:%d:%d] %20.20s ",
  769                       h->scsi_host->host_no,
  770                       hdev->bus, hdev->target, hdev->lun,
  771                       scsi_device_type(hdev->devtype));

so output_len at best contains the length of the last string printed.

Inside the loop, we then otherwise add to output_len. By magic,
we still have PATH_STRING_LEN available every time... This
wouldn't really be a problem if the bean-counting has been done
properly and each line actually does fit in 50 bytes, and maybe
it does, but I don't immediately see why. Suppose we end up
taking this branch:

  802                  output_len += snprintf(path[i] + output_len,
  803                          PATH_STRING_LEN,
  804                          "BOX: %hhu BAY: %hhu %s\n",
  805                          box, bay, active);

An optimistic estimate says this uses strlen("BOX: 1 BAY: 2
Active\n") which is 21. Now add the 20 bytes guaranteed by the
%20.20s and then some for the rest of that format string, and
we're easily over 50 bytes. I don't think we can get over 100
bytes even being pessimistic, so this just means we'll scribble
into the next path[i+1] and maybe get that overwritten later,
leading to some garbled output (in fact, since we'd overwrite the
previous string's 0-terminator, we could end up with one very
long string and then print various suffixes of that, leading to
much more than 400 bytes of output). Except of course when we're
filling path[7], where overrunning it means writing random stuff
to the kernel stack, which is usually a lot of fun.

We can fix all of that and get rid of the 400 byte stack buffer by
simply writing directly to the given output buffer, which the upper
layer guarantees is at least PAGE_SIZE. s[c]nprintf doesn't care where
it is writing to, so this doesn't make the spin lock hold time any
longer. Using scnprintf ensures that output_len always represents the
number of bytes actually written to the buffer, so we'll report the
proper amount to the upper layer.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Rasmus Villemoes 2015-11-04 15:52:28 -06:00 committed by Martin K. Petersen
parent 7c59a0d461
commit 1faf072c0e
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/scsi/hpsa.c
View File

@ -734,7 +734,6 @@ static ssize_t host_show_hp_ssd_smart_path_enabled(struct device *dev,
} }
#define MAX_PATHS 8 #define MAX_PATHS 8
#define PATH_STRING_LEN 50
static ssize_t path_info_show(struct device *dev, static ssize_t path_info_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
@ -750,9 +749,7 @@ static ssize_t path_info_show(struct device *dev,
u8 path_map_index = 0; u8 path_map_index = 0;
char *active; char *active;
unsigned char phys_connector[2]; unsigned char phys_connector[2];
unsigned char path[MAX_PATHS][PATH_STRING_LEN];
memset(path, 0, MAX_PATHS * PATH_STRING_LEN);
sdev = to_scsi_device(dev); sdev = to_scsi_device(dev);
h = sdev_to_hba(sdev); h = sdev_to_hba(sdev);
spin_lock_irqsave(&h->devlock, flags); spin_lock_irqsave(&h->devlock, flags);
@ -772,8 +769,9 @@ static ssize_t path_info_show(struct device *dev,
else else
continue; continue;
output_len = snprintf(path[i], output_len += scnprintf(buf + output_len,
PATH_STRING_LEN, "[%d:%d:%d:%d] %20.20s ", PAGE_SIZE - output_len,
"[%d:%d:%d:%d] %20.20s ",
h->scsi_host->host_no, h->scsi_host->host_no,
hdev->bus, hdev->target, hdev->lun, hdev->bus, hdev->target, hdev->lun,
scsi_device_type(hdev->devtype)); scsi_device_type(hdev->devtype));
@ -781,9 +779,9 @@ static ssize_t path_info_show(struct device *dev,
if (hdev->external || if (hdev->external ||
hdev->devtype == TYPE_RAID || hdev->devtype == TYPE_RAID ||
is_logical_device(hdev)) { is_logical_device(hdev)) {
output_len += snprintf(path[i] + output_len, output_len += snprintf(buf + output_len,
PATH_STRING_LEN, "%s\n", PAGE_SIZE - output_len,
active); "%s\n", active);
continue; continue;
} }
@ -795,35 +793,33 @@ static ssize_t path_info_show(struct device *dev,
if (phys_connector[1] < '0') if (phys_connector[1] < '0')
phys_connector[1] = '0'; phys_connector[1] = '0';
if (hdev->phys_connector[i] > 0) if (hdev->phys_connector[i] > 0)
output_len += snprintf(path[i] + output_len, output_len += snprintf(buf + output_len,
PATH_STRING_LEN, PAGE_SIZE - output_len,
"PORT: %.2s ", "PORT: %.2s ",
phys_connector); phys_connector);
if (hdev->devtype == TYPE_DISK && hdev->expose_device) { if (hdev->devtype == TYPE_DISK && hdev->expose_device) {
if (box == 0 || box == 0xFF) { if (box == 0 || box == 0xFF) {
output_len += snprintf(path[i] + output_len, output_len += snprintf(buf + output_len,
PATH_STRING_LEN, PAGE_SIZE - output_len,
"BAY: %hhu %s\n", "BAY: %hhu %s\n",
bay, active); bay, active);
} else { } else {
output_len += snprintf(path[i] + output_len, output_len += snprintf(buf + output_len,
PATH_STRING_LEN, PAGE_SIZE - output_len,
"BOX: %hhu BAY: %hhu %s\n", "BOX: %hhu BAY: %hhu %s\n",
box, bay, active); box, bay, active);
} }
} else if (box != 0 && box != 0xFF) { } else if (box != 0 && box != 0xFF) {
output_len += snprintf(path[i] + output_len, output_len += snprintf(buf + output_len,
PATH_STRING_LEN, "BOX: %hhu %s\n", PAGE_SIZE - output_len, "BOX: %hhu %s\n",
box, active); box, active);
} else } else
output_len += snprintf(path[i] + output_len, output_len += snprintf(buf + output_len,
PATH_STRING_LEN, "%s\n", active); PAGE_SIZE - output_len, "%s\n", active);
} }
spin_unlock_irqrestore(&h->devlock, flags); spin_unlock_irqrestore(&h->devlock, flags);
return snprintf(buf, output_len+1, "%s%s%s%s%s%s%s%s", return output_len;
path[0], path[1], path[2], path[3],
path[4], path[5], path[6], path[7]);
} }
static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL); static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL);