diff for duplicates of <20150604144756.GA8897@mwanda> diff --git a/a/1.txt b/N1/1.txt index 667c52d..59e8a9f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,9 +45,9 @@ index 1dafeb4..cab4e98 100644 /* 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"); +- sprintf(msg, "reset %s", rc == 0 ? "completed successfully" : "failed"); + snprintf(msg, sizeof(msg), "reset %s", -+ rc = 0 ? "completed successfully" : "failed"); ++ rc == 0 ? "completed successfully" : "failed"); hpsa_show_dev_msg(KERN_WARNING, h, dev, msg); - return rc = 0 ? SUCCESS : FAILED; + return rc == 0 ? SUCCESS : FAILED; } diff --git a/a/content_digest b/N1/content_digest index 7f5863d..0da8338 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] hpsa: fix an sprintf() overflow in the reset handler\0" - "Date\0Thu, 04 Jun 2015 14:47:56 +0000\0" + "Date\0Thu, 4 Jun 2015 17:47:56 +0300\0" "To\0Don Brace <don.brace@pmcs.com>\0" "Cc\0James E.J. Bottomley <JBottomley@odin.com>" iss_storagedev@hp.com @@ -56,11 +56,11 @@ " \t/* send a reset to the SCSI LUN which the command was sent to */\n" " \trc = hpsa_do_reset(h, dev, dev->scsi3addr, HPSA_RESET_TYPE_LUN,\n" " \t\t\t DEFAULT_REPLY_QUEUE);\n" - "-\tsprintf(msg, \"reset %s\", rc = 0 ? \"completed successfully\" : \"failed\");\n" + "-\tsprintf(msg, \"reset %s\", rc == 0 ? \"completed successfully\" : \"failed\");\n" "+\tsnprintf(msg, sizeof(msg), \"reset %s\",\n" - "+\t\t rc = 0 ? \"completed successfully\" : \"failed\");\n" + "+\t\t rc == 0 ? \"completed successfully\" : \"failed\");\n" " \thpsa_show_dev_msg(KERN_WARNING, h, dev, msg);\n" - " \treturn rc = 0 ? SUCCESS : FAILED;\n" + " \treturn rc == 0 ? SUCCESS : FAILED;\n" } -8f84236bdee97d068bc83a0c34653d9f742862f021443bfdf6e52820cb495adc +6ef70c62d5dd1b9618f0847c9378167530a29232ce10663b2f9d40f8f0b46021
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.