hpsa: fix an sprintf() overflow in the reset handler

The string "cmd %d RESET FAILED, new lockup detected" is not quite
large enough so the sprintf() will overflow.  I have increased the size
of the buffer and also changed the sprintf calls to snprintf.

Fixes: 73153fe533bc ('hpsa: use block layer tag for command allocation')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Orabug: 23064595
Signed-off-by: Manjunath Govindashetty <manjunath.govindashetty@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a6ef9c08b7ed362e933fcd793817f9d3d41d60c4..0fbeb474eebb260f50ab22167ef7e67daaee894d 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5241,7 +5241,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
        int rc;
        struct ctlr_info *h;
        struct hpsa_scsi_dev_t *dev;
-       char msg[40];
+       char msg[48];
 
        /* find the controller to which the command to be aborted was sent */
        h = sdev_to_hba(scsicmd->device);
@@ -5259,16 +5259,18 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
 
        /* if controller locked up, we can guarantee command won't complete */
        if (lockup_detected(h)) {
-               sprintf(msg, "cmd %d RESET FAILED, lockup detected",
-                               hpsa_get_cmd_index(scsicmd));
+               snprintf(msg, sizeof(msg),
+                        "cmd %d RESET FAILED, lockup detected",
+                        hpsa_get_cmd_index(scsicmd));
                hpsa_show_dev_msg(KERN_WARNING, h, dev, msg);
                return FAILED;
        }
 
        /* this reset request might be the result of a lockup; check */
        if (detect_controller_lockup(h)) {
-               sprintf(msg, "cmd %d RESET FAILED, new lockup detected",
-                               hpsa_get_cmd_index(scsicmd));
+               snprintf(msg, sizeof(msg),
+                        "cmd %d RESET FAILED, new lockup detected",
+                        hpsa_get_cmd_index(scsicmd));
                hpsa_show_dev_msg(KERN_WARNING, h, dev, msg);
                return FAILED;
        }
@@ -5282,7 +5284,8 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
        /* send a reset to the SCSI LUN which the command was sent to */
        rc = hpsa_do_reset(h, dev, dev->scsi3addr, HPSA_RESET_TYPE_LUN,
                           DEFAULT_REPLY_QUEUE);
-       sprintf(msg, "reset %s", rc == 0 ? "completed successfully" : "failed");
+       snprintf(msg, sizeof(msg), "reset %s",
+                rc == 0 ? "completed successfully" : "failed");
        hpsa_show_dev_msg(KERN_WARNING, h, dev, msg);
        return rc == 0 ? SUCCESS : FAILED;
 }