]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
scsi: Have scsi_init_dev_desc_priv() use memset
authorTom Rini <trini@konsulko.com>
Wed, 8 Nov 2023 19:28:11 +0000 (14:28 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 10 Nov 2023 15:59:24 +0000 (10:59 -0500)
When we do not have CONFIG_BOUNCE_BUFFER enabled, inside of
scsi_init_dev_desc_priv we never set the 'bb' field to false, we only
initialize it to true when CONFIG_BOUNCE_BUFFER is set. Given that we
have a number of other fields here we had been explicitly setting to
zero, change to first calling memset to clear the struct and then
initialize only the fields that need non-zero default values.

Addresses-Coverity-ID: 467407 ("Uninitialized variables (UNINIT)")
Fixes: 81bd22e935dc ("rockchip: block: blk-uclass: add bounce buffer flag to blk_desc")
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/scsi/scsi.c

index 779a34bd2f1ce8f022fea8f78fab078bf15bd4c8..b76aadb0653deb82303887b80aaa526cc3ea7e32 100644 (file)
@@ -450,15 +450,12 @@ static void scsi_setup_test_unit_ready(struct scsi_cmd *pccb)
  */
 static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc)
 {
+       memset(dev_desc, 0, sizeof(struct blk_desc));
        dev_desc->target = 0xff;
        dev_desc->lun = 0xff;
        dev_desc->log2blksz =
                LOG2_INVALID(typeof(dev_desc->log2blksz));
        dev_desc->type = DEV_TYPE_UNKNOWN;
-       dev_desc->vendor[0] = 0;
-       dev_desc->product[0] = 0;
-       dev_desc->revision[0] = 0;
-       dev_desc->removable = false;
 #if IS_ENABLED(CONFIG_BOUNCE_BUFFER)
        dev_desc->bb = true;
 #endif /* CONFIG_BOUNCE_BUFFER */