From 7a39d7758c9c799bc6341a8a339a91692ec8a9dd Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Tue, 25 Sep 2018 18:52:26 +0800

Subject: [PATCH 01/30] Fix overrunning array.

Issue:

 * `jrp` might pointing outside of join_arr after the for loop.

 * Out of index: `op->cdb`.

Fix:

 * Check index number before dereferencing `jpr` pointer.

 * Check index number before access `op->cdb` array.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sg_raw.c | 2 +-

 src/sg_ses.c | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sg_raw.c b/src/sg_raw.c

index 92c2287..90c3d9c 100644

--- a/src/sg_raw.c

+++ b/src/sg_raw.c

@@ -454,7 +454,7 @@ parse_cmd_line(struct opts_t * op, int argc, char *argv[])

             return SG_LIB_SYNTAX_ERROR;

         }

-        if (op->cdb_length > MAX_SCSI_CDBSZ) {

+        if (op->cdb_length >= MAX_SCSI_CDBSZ) {

             pr2serr("CDB too long (max. %d bytes)\n", MAX_SCSI_CDBSZ);

             return SG_LIB_SYNTAX_ERROR;

         }

diff --git a/src/sg_ses.c b/src/sg_ses.c

index abb1fea..29b66b3 100644

--- a/src/sg_ses.c

+++ b/src/sg_ses.c

@@ -5310,7 +5310,7 @@ ses_cgs(struct sg_pt_base * ptvp, const struct tuple_acronym_val * tavp,

         if (op->ind_indiv_last <= op->ind_indiv)

             break;

     }   /* end of loop over join array */

-    if ((NULL == jrp->enc_statp) || (k >= MX_JOIN_ROWS)) {

+    if ((k >= MX_JOIN_ROWS) || (NULL == jrp->enc_statp)) {

         if (op->desc_name)

             pr2serr("descriptor name: %s not found (check the 'ed' page "

                     "[0x7])\n", op->desc_name);

-- 

1.8.3.1

From ad7d26c94ad555a647528c31eb11b78fc0ac4474 Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Tue, 25 Sep 2018 18:59:01 +0800

Subject: [PATCH 02/30] sg_persist: Workaround for false warning of covscan.

The covscan think we might access out of index on `tid_arr` but

actually we did the index check before.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sg_persist.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sg_persist.c b/src/sg_persist.c

index f582d32..b565a5a 100644

--- a/src/sg_persist.c

+++ b/src/sg_persist.c

@@ -824,7 +824,7 @@ decode_file_tids(const char * fnp, struct opts_t * op)

                     pr2serr("%s: array length exceeded\n", __func__);

                     goto bad;

                 }

-                tid_arr[off + k] = h;

+                op->transportid_arr[off + k] = h;

                 lcp = strpbrk(lcp, " ,\t");

                 if (NULL == lcp)

                     break;

-- 

1.8.3.1

From 24e54cf4c04fa7aa3bdf8e7315ce6240ab306c5f Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Tue, 25 Sep 2018 19:12:34 +0800

Subject: [PATCH 03/30] sg_opcodes: Fix overrun of array.

Overrunning array `b` as 4 + m might bigger than the size of array `b`.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sg_opcodes.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sg_opcodes.c b/src/sg_opcodes.c

index 21897c4..a8cf762 100644

--- a/src/sg_opcodes.c

+++ b/src/sg_opcodes.c

@@ -799,7 +799,8 @@ list_all_codes(uint8_t * rsoc_buff, int rsoc_len, struct opts_t * op,

                         printf("             usage: ");

                     else

                         printf("        cdb usage: ");

-                    for (m = 0; m < cdb_sz; ++m)

+                    for (m = 0; (m < cdb_sz) && ((size_t) (4 + m) < sizeof(b));

+                         ++m)

                         printf("%.2x ", b[4 + m]);

                     printf("\n");

                 }

-- 

1.8.3.1

From ca241cf82c746391edb3b460550310da40202fe4 Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Wed, 26 Sep 2018 20:34:42 +0800

Subject: [PATCH 04/30] sg_lib: Fix overruning of array

 `sg_lib_scsi_status_sense_arr`

Check index before dereferencing `mp`.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 include/sg_lib_data.h | 2 ++

 lib/sg_lib.c          | 3 +++

 lib/sg_lib_data.c     | 6 ++++++

 3 files changed, 11 insertions(+)

diff --git a/include/sg_lib_data.h b/include/sg_lib_data.h

index a870043..9739453 100644

--- a/include/sg_lib_data.h

+++ b/include/sg_lib_data.h

@@ -122,6 +122,8 @@ extern struct sg_lib_simple_value_name_t sg_lib_nvme_nvm_cmd_arr[];

 extern struct sg_lib_value_name_t sg_lib_nvme_cmd_status_arr[];

 extern struct sg_lib_4tuple_u8 sg_lib_scsi_status_sense_arr[];

+size_t sg_lib_scsi_status_sense_arr_len(void);

+

 extern struct sg_value_2names_t sg_exit_str_arr[];

 #ifdef __cplusplus

diff --git a/lib/sg_lib.c b/lib/sg_lib.c

index c2c5891..c281cce 100644

--- a/lib/sg_lib.c

+++ b/lib/sg_lib.c

@@ -2585,6 +2585,9 @@ sg_nvme_status2scsi(uint16_t sct_sc, uint8_t * status_p, uint8_t * sk_p,

         return false;

     } else if (ind >= k)

         return false;

+    /* Check whether `ind` is out of index of sg_lib_scsi_status_sense_arr */

+    if (ind >= (int) sg_lib_scsi_status_sense_arr_len())

+        return false;

     mp = sg_lib_scsi_status_sense_arr + ind;

     if (status_p)

         *status_p = mp->t1;

diff --git a/lib/sg_lib_data.c b/lib/sg_lib_data.c

index d5ca380..3a898e5 100644

--- a/lib/sg_lib_data.c

+++ b/lib/sg_lib_data.c

@@ -1850,3 +1850,9 @@ struct sg_value_2names_t sg_exit_str_arr[] = {

 };

 #endif           /* (SG_SCSI_STRINGS && HAVE_NVME && (! IGNORE_NVME)) */

+

+size_t sg_lib_scsi_status_sense_arr_len(void)

+{

+    return sizeof(sg_lib_scsi_status_sense_arr)/

+        sizeof(struct sg_lib_4tuple_u8) - 1;

+}

-- 

1.8.3.1

From 36a487285d9e7c9afce9acaefa8fad25017cacd8 Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Fri, 28 Sep 2018 20:56:26 +0800

Subject: [PATCH 05/30] sginfo,sg_dd: Fix resource leak.

 * sginfo: Free the memory of `headsp`.

 * sg_dd: Close infd/outfd before return error.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sg_dd.c  | 6 ++++++

 src/sginfo.c | 1 +

 2 files changed, 7 insertions(+)

diff --git a/src/sg_dd.c b/src/sg_dd.c

index edd8f9c..6bdbcdb 100644

--- a/src/sg_dd.c

+++ b/src/sg_dd.c

@@ -1276,6 +1276,7 @@ open_if(const char * inf, int64_t skip, int bpt, struct flags_t * ifp,

                 perror(ME "SG_SET_RESERVED_SIZE error");

             res = ioctl(infd, SG_GET_VERSION_NUM, &t);

             if ((res < 0) || (t < 30000)) {

+                close(infd);

                 if (FT_BLOCK & *in_typep)

                     pr2serr(ME "SG_IO unsupported on this block device\n");

                 else

@@ -1308,6 +1309,7 @@ open_if(const char * inf, int64_t skip, int bpt, struct flags_t * ifp,

                     snprintf(ebuff, EBUFF_SZ, ME "couldn't skip to "

                              "required position on %s", inf);

                     perror(ebuff);

+                    close(infd);

                     goto file_err;

                 }

                 if (vb)

@@ -1341,6 +1343,7 @@ open_if(const char * inf, int64_t skip, int bpt, struct flags_t * ifp,

 file_err:

     return -SG_LIB_FILE_ERROR;

 other_err:

+    close(infd);

     return -SG_LIB_CAT_OTHER;

 }

@@ -1398,6 +1401,7 @@ open_of(const char * outf, int64_t seek, int bpt, struct flags_t * ofp,

                 perror(ME "SG_SET_RESERVED_SIZE error");

             res = ioctl(outfd, SG_GET_VERSION_NUM, &t);

             if ((res < 0) || (t < 30000)) {

+                close(outfd);

                 pr2serr(ME "sg driver prior to 3.x.y\n");

                 goto file_err;

             }

@@ -1447,6 +1451,7 @@ open_of(const char * outf, int64_t seek, int bpt, struct flags_t * ofp,

                 snprintf(ebuff, EBUFF_SZ,

                     ME "couldn't seek to required position on %s", outf);

                 perror(ebuff);

+                close(outfd);

                 goto file_err;

             }

             if (vb)

@@ -1469,6 +1474,7 @@ open_of(const char * outf, int64_t seek, int bpt, struct flags_t * ofp,

 file_err:

     return -SG_LIB_FILE_ERROR;

 other_err:

+    close(outfd);

     return -SG_LIB_CAT_OTHER;

 }

diff --git a/src/sginfo.c b/src/sginfo.c

index bddc964..1032f05 100644

--- a/src/sginfo.c

+++ b/src/sginfo.c

@@ -1825,6 +1825,7 @@ trytenbyte:

         }

     }

     printf("\n");

+    free(headsp);

     return status;

 }

-- 

1.8.3.1

From 5bd764553056b2182db8ef8d6c1a1ab09b0d5a24 Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Wed, 26 Sep 2018 21:10:23 +0800

Subject: [PATCH 06/30] covscan: Calling func without checking return value

* Use the macro `_ignore_return()` defined in `misc.h` to ignore the

  return value of functions.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/misc.h          | 34 ++++++++++++++++++++++++++++++++++

 src/sg_get_config.c |  6 ++++--

 src/sg_logs.c       |  6 ++++--

 src/sg_persist.c    | 13 +++++++++----

 src/sg_xcopy.c      | 23 +++++++++++++----------

 5 files changed, 64 insertions(+), 18 deletions(-)

 create mode 100644 src/misc.h

diff --git a/src/misc.h b/src/misc.h

new file mode 100644

index 0000000..6289eae

--- /dev/null

+++ b/src/misc.h

@@ -0,0 +1,34 @@

+/*

+ * Copyright (c) 2018 Red Hat, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ *

+ * Author:  Gris Ge <fge@redhat.com>

+ */

+#ifndef __SG_UTILS_MISC_H__

+#define __SG_UTILS_MISC_H__

+

+/* Just make coverity scan happy. */

+#define _ignore_return(x) if (x) {}

+

+#endif /* End of __SG_UTILS_MISC_H__ */

diff --git a/src/sg_get_config.c b/src/sg_get_config.c

index 28af720..4d2cc9b 100644

--- a/src/sg_get_config.c

+++ b/src/sg_get_config.c

@@ -24,6 +24,8 @@

 #include "sg_unaligned.h"

 #include "sg_pr2serr.h"

+#include "misc.h"

+

 /* A utility program originally written for the Linux OS SCSI subsystem.

  *

  * This program outputs information provided by a SCSI "Get Configuration"

@@ -1091,7 +1093,7 @@ main(int argc, char * argv[])

         pr2serr(ME "%s doesn't respond to a SCSI INQUIRY\n", device_name);

         return SG_LIB_CAT_OTHER;

     }

-    sg_cmds_close_device(sg_fd);

+    _ignore_return(sg_cmds_close_device(sg_fd));

     sg_fd = sg_cmds_open_device(device_name, readonly, verbose);

     if (sg_fd < 0) {

@@ -1122,7 +1124,7 @@ main(int argc, char * argv[])

     } else {

         char b[80];

-        sg_get_category_sense_str(res, sizeof(b), b, verbose);

+        _ignore_return(sg_get_category_sense_str(res, sizeof(b), b, verbose));

         pr2serr("Get Configuration command: %s\n", b);

         if (0 == verbose)

             pr2serr("    try '-v' option for more information\n");

diff --git a/src/sg_logs.c b/src/sg_logs.c

index 61443ff..e4f265e 100644

--- a/src/sg_logs.c

+++ b/src/sg_logs.c

@@ -34,6 +34,8 @@

 #include "sg_unaligned.h"

 #include "sg_pr2serr.h"

+#include "misc.h"

+

 static const char * version_str = "1.69 20180911";    /* spc5r19 + sbc4r11 */

 #define MX_ALLOC_LEN (0xfffc)

@@ -6776,7 +6778,7 @@ fetchTemperature(int sg_fd, uint8_t * resp, int max_len, struct opts_t * op)

             pr2serr("Unable to find temperature in either Temperature or "

                     "IE log page\n");

     }

-    sg_cmds_close_device(sg_fd);

+    _ignore_return(sg_cmds_close_device(sg_fd));

     return (res >= 0) ? res : SG_LIB_CAT_OTHER;

 }

@@ -7246,7 +7248,7 @@ err_out:

     if (free_parr)

         free(free_parr);

     if (sg_fd >= 0)

-        sg_cmds_close_device(sg_fd);

+        _ignore_return(sg_cmds_close_device(sg_fd));

     if (0 == vb) {

         if (! sg_if_can2stderr("sg_logs failed: ", ret))

             pr2serr("Some error occurred, try again with '-v' or '-vv' for "

diff --git a/src/sg_persist.c b/src/sg_persist.c

index b565a5a..2e10aff 100644

--- a/src/sg_persist.c

+++ b/src/sg_persist.c

@@ -33,6 +33,8 @@

 #include "sg_unaligned.h"

 #include "sg_pr2serr.h"

+#include "misc.h"

+

 static const char * version_str = "0.66 20180615";

@@ -303,7 +305,8 @@ prin_work(int sg_fd, const struct opts_t * op)

             pr2serr("PR in (%s): bad field in cdb or parameter list (perhaps "

                     "unsupported service action)\n", b);

         else {

-            sg_get_category_sense_str(res, sizeof(bb), bb, op->verbose);

+            _ignore_return(sg_get_category_sense_str(res, sizeof(bb), bb,

+                                                     op->verbose));

             pr2serr("PR in (%s): %s\n", b, bb);

         }

         goto fini;

@@ -519,7 +522,8 @@ prout_work(int sg_fd, struct opts_t * op)

                 pr2serr("PR out (%s): bad field in cdb or parameter list "

                         "(perhaps unsupported service action)\n", b);

             else {

-                sg_get_category_sense_str(res, sizeof(bb), bb, op->verbose);

+                _ignore_return(sg_get_category_sense_str(res, sizeof(bb), bb,

+                                                         op->verbose));

                 pr2serr("PR out (%s): %s\n", b, bb);

             }

             goto fini;

@@ -573,7 +577,8 @@ prout_reg_move_work(int sg_fd, struct opts_t * op)

         else {

             char bb[80];

-            sg_get_category_sense_str(res, sizeof(bb), bb, op->verbose);

+            _ignore_return(sg_get_category_sense_str(res, sizeof(bb), bb,

+                                                     op->verbose));

             pr2serr("PR out (register and move): %s\n", bb);

         }

         goto fini;

@@ -1277,7 +1282,7 @@ main(int argc, char * argv[])

             flagged = true;

             goto fini;

         }

-        sg_cmds_close_device(sg_fd);

+        _ignore_return(sg_cmds_close_device(sg_fd));

     }

     if (! op->readwrite_force) {

diff --git a/src/sg_xcopy.c b/src/sg_xcopy.c

index 5facfc8..6230685 100644

--- a/src/sg_xcopy.c

+++ b/src/sg_xcopy.c

@@ -67,6 +67,8 @@

 #include "sg_unaligned.h"

 #include "sg_pr2serr.h"

+#include "misc.h"

+

 static const char * version_str = "0.68 20180811";

 #define ME "sg_xcopy: "

@@ -341,7 +343,7 @@ open_sg(struct xcopy_fp_t * fp, int vb)

     }

     if (sg_simple_inquiry(fp->sg_fd, &sir, false, vb)) {

         pr2serr("INQUIRY failed on %s\n", ebuff);

-        sg_cmds_close_device(fp->sg_fd);

+        _ignore_return(sg_cmds_close_device(fp->sg_fd));

         fp->sg_fd = -1;

         return -1;

     }

@@ -415,7 +417,7 @@ dd_filetype_str(int ft, char * buff)

     if (FT_OTHER & ft)

         off += sg_scnpr(buff + off, 32, "other (perhaps ordinary file) ");

     if (FT_ERROR & ft)

-        sg_scnpr(buff + off, 32, "unable to 'stat' file ");

+        _ignore_return(sg_scnpr(buff + off, 32, "unable to 'stat' file "));

     return buff;

 }

@@ -640,7 +642,7 @@ scsi_extended_copy(int sg_fd, uint8_t list_id,

                                 DEF_GROUP_NUM, DEF_3PC_OUT_TIMEOUT,

                                 xcopyBuff, desc_offset, true, verb);

     if (res) {

-        sg_get_category_sense_str(res, sizeof(b), b, verb);

+        _ignore_return(sg_get_category_sense_str(res, sizeof(b), b, verb));

         pr2serr("Xcopy(LID1): %s\n", b);

     }

     return res;

@@ -660,7 +662,7 @@ scsi_read_capacity(struct xcopy_fp_t *xfp)

     res = sg_ll_readcap_10(xfp->sg_fd, false /* pmi */, 0, rcBuff,

                            READ_CAP_REPLY_LEN, true, verb);

     if (0 != res) {

-        sg_get_category_sense_str(res, sizeof(b), b, verb);

+        _ignore_return(sg_get_category_sense_str(res, sizeof(b), b, verb));

         pr2serr("Read capacity(10): %s\n", b);

         return res;

     }

@@ -672,7 +674,7 @@ scsi_read_capacity(struct xcopy_fp_t *xfp)

         res = sg_ll_readcap_16(xfp->sg_fd, false /* pmi */, 0, rcBuff,

                                RCAP16_REPLY_LEN, true, verb);

         if (0 != res) {

-            sg_get_category_sense_str(res, sizeof(b), b, verb);

+            _ignore_return(sg_get_category_sense_str(res, sizeof(b), b, verb));

             pr2serr("Read capacity(16): %s\n", b);

             return res;

         }

@@ -714,7 +716,7 @@ scsi_operating_parameter(struct xcopy_fp_t *xfp, int is_target)

     res = sg_ll_receive_copy_results(xfp->sg_fd, SA_COPY_OP_PARAMS, 0, rcBuff,

                                      rcBuffLen, true, verb);

     if (0 != res) {

-        sg_get_category_sense_str(res, sizeof(b), b, verb);

+        _ignore_return(sg_get_category_sense_str(res, sizeof(b), b, verb));

         pr2serr("Xcopy operating parameters: %s\n", b);

         return -res;

     }

@@ -1006,8 +1008,8 @@ decode_designation_descriptor(const uint8_t * bp, int i_len)

 {

     char c[2048];

-    sg_get_designation_descriptor_str(NULL, bp, i_len, 1, verbose,

-                                      sizeof(c), c);

+    _ignore_return(sg_get_designation_descriptor_str(NULL, bp, i_len, 1,

+                                                     verbose, sizeof(c), c));

     pr2serr("%s", c);

 }

@@ -1029,7 +1031,8 @@ desc_from_vpd_id(int sg_fd, uint8_t *desc, int desc_len,

         if (SG_LIB_CAT_ILLEGAL_REQ == res)

             pr2serr("Device identification VPD page not found\n");

         else {

-            sg_get_category_sense_str(res, sizeof(b), b, verbose);

+            _ignore_return(sg_get_category_sense_str(res, sizeof(b), b,

+                                                     verbose));

             pr2serr("VPD inquiry (Device ID): %s\n", b);

             pr2serr("   try again with '-vv'\n");

         }

@@ -1042,7 +1045,7 @@ desc_from_vpd_id(int sg_fd, uint8_t *desc, int desc_len,

     res = sg_ll_inquiry(sg_fd, false, true, VPD_DEVICE_ID, rcBuff, len, true,

                         verb);

     if (0 != res) {

-        sg_get_category_sense_str(res, sizeof(b), b, verbose);

+        _ignore_return(sg_get_category_sense_str(res, sizeof(b), b, verbose));

         pr2serr("VPD inquiry (Device ID): %s\n", b);

         return res;

     } else if (rcBuff[1] != VPD_DEVICE_ID) {

-- 

1.8.3.1

From 3a99f93d11cea7d4273477c698eb6bfb2f6d4696 Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Wed, 26 Sep 2018 22:14:11 +0800

Subject: [PATCH 07/30] sg_dd: flock does not allows negative fd.

 * The `outfd` could be -1 in line 1408. We do negative number check on

   `outfd` before sending to flock.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sg_dd.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sg_dd.c b/src/sg_dd.c

index 6bdbcdb..8696ee7 100644

--- a/src/sg_dd.c

+++ b/src/sg_dd.c

@@ -1459,7 +1459,7 @@ open_of(const char * outf, int64_t seek, int bpt, struct flags_t * ofp,

                         "\n", (uint64_t)offset);

         }

     }

-    if (ofp->flock) {

+    if ((ofp->flock) && (outfd >= 0)) {

         res = flock(outfd, LOCK_EX | LOCK_NB);

         if (res < 0) {

             close(outfd);

-- 

1.8.3.1

From 158f6547f156b8a7fc175904b4bd502642ed56a5 Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Wed, 26 Sep 2018 22:21:00 +0800

Subject: [PATCH 08/30] sginfo: Suspend the fallthrough warning.

* The GCC and Clang will complain about fallthrough of switch statement,

  use maker comments to suspend that.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sginfo.c | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/src/sginfo.c b/src/sginfo.c

index 1032f05..9c626ee 100644

--- a/src/sginfo.c

+++ b/src/sginfo.c

@@ -1757,6 +1757,7 @@ trytenbyte:

                     }

                     else if (!sorthead) printf("|");

                 }

+                /* fall through */

             case 5:     /* physical sector */

                 while (len > 0) {

                     snprintf((char *)cbuffer1, 40, "%6d:%2u:%5d",

@@ -1775,6 +1776,7 @@ trytenbyte:

                     }

                     else if (!sorthead) printf("|");

                 }

+                /* fall through */

             case 0:     /* lba (32 bit) */

                 while (len > 0) {

                     printf("%10d", getnbyte(df, 4));

@@ -1788,6 +1790,7 @@ trytenbyte:

                     else

                         printf("|");

                 }

+                /* fall through */

             case 3:     /* lba (64 bit) */

                 while (len > 0) {

                     printf("%15" PRId64 , getnbyte_ll(df, 8));

-- 

1.8.3.1

From 7e90f135eeb3900735847df32ed878d8207c59dc Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Wed, 26 Sep 2018 22:24:01 +0800

Subject: [PATCH 09/30] sg_get_lba_status: Fix incorrect use of

 sg_ll_get_lba_status32.

Fix the incorrect argument order of `sg_get_lba_status()`.

Signed-off-by: Gris Ge <fge@redhat.com>

---

 src/sg_get_lba_status.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sg_get_lba_status.c b/src/sg_get_lba_status.c

index 91c7a96..61a823b 100644

--- a/src/sg_get_lba_status.c

+++ b/src/sg_get_lba_status.c

@@ -340,7 +340,7 @@ main(int argc, char * argv[])

         res = sg_ll_get_lba_status16(sg_fd, lba, rt, glbasBuffp, maxlen, true,

                                      verbose);

     else if (do_32)     /* keep analyser happy since do_32 must be true */

-        res = sg_ll_get_lba_status32(sg_fd, lba, element_id, scan_len, rt,

+        res = sg_ll_get_lba_status32(sg_fd, lba, scan_len, element_id, rt,

                                      glbasBuffp, maxlen, true, verbose);

     ret = res;

-- 

1.8.3.1

From c86a7be69c8601722ba39ef6eacc6aaa993b3d5a Mon Sep 17 00:00:00 2001

From: Gris Ge <fge@redhat.com>

Date: Wed, 26 Sep 2018 22:35:35 +0800

Subject: [PATCH 10/30] rescan-scsi-bus.sh: Fix shellcheck warning of SC2155.

Declare and assign separately to avoid masking return values:

    https://github.com/koalaman/shellcheck/wiki/SC2155

Signed-off-by: Gris Ge <fge@redhat.com>

---

 scripts/rescan-scsi-bus.sh | 24 ++++++++++++++++--------

 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh

index 6989208..75e169a 100755

--- a/scripts/rescan-scsi-bus.sh

+++ b/scripts/rescan-scsi-bus.sh

@@ -314,8 +314,10 @@ testonline ()

       fi

   else

       # Ignore disk revision change

-      local old_str_no_rev=`echo "$TMPSTR" | sed -e 's/.\{4\}$//'`

-      local new_str_no_rev=`echo "$STR" | sed -e 's/.\{4\}$//'`

+      local old_str_no_rev

+      old_str_no_rev=`echo "$TMPSTR" | sed -e 's/.\{4\}$//'`

+      local new_str_no_rev

+      new_str_no_rev=`echo "$STR" | sed -e 's/.\{4\}$//'`

       if [ "$old_str_no_rev" != "$new_str_no_rev" ]; then

         echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${SCSISTR#* } \nto: $STR ${norm} \n\n\n"

         return 1

@@ -696,7 +698,8 @@ searchexisting()

   local tmpch;

   local tmpid

   local match=0

-  local targets=`ls -d /sys/class/scsi_device/$host:* 2> /dev/null | egrep -o $host:[0-9]+:[0-9]+ | sort | uniq`

+  local targets

+  targets=`ls -d /sys/class/scsi_device/$host:* 2> /dev/null | egrep -o $host:[0-9]+:[0-9]+ | sort | uniq`

   # Nothing came back on this host, so we should skip it

   test -z "$targets" && return

@@ -742,13 +745,15 @@ searchexisting()

 findremapped()

 {

   local hctl=;

-  local devs=`ls /sys/class/scsi_device/`

+  local devs

+  devs=`ls /sys/class/scsi_device/`

   local sddev=

   local id_serial=

   local id_serial_old=

   local remapped=

   mpaths=""

-  local tmpfile=$(mktemp /tmp/rescan-scsi-bus.XXXXXXXX 2> /dev/null)

+  local tmpfile

+  tmpfile=$(mktemp /tmp/rescan-scsi-bus.XXXXXXXX 2> /dev/null)

   if [ -z "$tmpfile" ] ; then

     tmpfile="/tmp/rescan-scsi-bus.$$"

@@ -835,7 +840,8 @@ incrchgd()

   fi

   if test -n "$mp_enable" ; then

-    local sdev="`findsddev \"$hctl\"`"

+    local sdev

+    sdev="`findsddev \"$hctl\"`"

     if test -n "$sdev" ; then

       findmultipath "$sdev"

     fi

@@ -853,7 +859,8 @@ incrrmvd()

   fi

   if test -n "$mp_enable" ; then

-    local sdev="`findsddev \"$hctl\"`"

+    local sdev

+    sdev="`findsddev \"$hctl\"`"

     if test -n "$sdev" ; then

       findmultipath "$sdev"

     fi

@@ -902,7 +909,8 @@ findmultipath()

     return 1

   fi

-  local maj_min=`cat /sys/block/$dev/dev`

+  local maj_min

+  maj_min=`cat /sys/block/$dev/dev`

   for mp in $($DMSETUP ls --target=multipath | cut -f 1) ; do

     [ "$mp" = "No" ] && break;

     if $DMSETUP status $mp | grep -q " $maj_min "; then

-- 

1.8.3.1