Skip to content

Commit

Permalink
hw/ufs: Fix code coverity issues
Browse files Browse the repository at this point in the history
Fixed four ufs-related coverity issues.

The coverity issues and fixes are as follows

1. CID 1519042: Security issue with the rand() function
Changed to use a fixed value (0xab) instead of rand() as
the value for testing

2. CID 1519043: Dereference after null check
Removed useless (redundant) null checks

3. CID 1519050: Out-of-bounds access issue
Fix to pass an array type variable to find_first_bit and
find_next_bit using DECLARE_BITMAP()

4. CID 1519051: Out-of-bounds read issue
Fix incorrect range check for lun

Fix coverity CID: 1519042 1519043 1519050 1519051

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
  • Loading branch information
Jeuk Kim committed Oct 13, 2023
1 parent 6301137 commit 97970da
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
16 changes: 7 additions & 9 deletions hw/ufs/lu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1345,13 +1345,12 @@ static void ufs_lu_realize(SCSIDevice *dev, Error **errp)
return;
}

if (lu->qdev.conf.blk) {
ctx = blk_get_aio_context(lu->qdev.conf.blk);
aio_context_acquire(ctx);
if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
goto out;
}
ctx = blk_get_aio_context(lu->qdev.conf.blk);
aio_context_acquire(ctx);
if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
goto out;
}

lu->qdev.blocksize = UFS_BLOCK_SIZE;
blk_get_geometry(lu->qdev.conf.blk, &nb_sectors);
nb_blocks = nb_sectors / (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
Expand All @@ -1367,10 +1366,9 @@ static void ufs_lu_realize(SCSIDevice *dev, Error **errp)
}

ufs_lu_brdv_init(lu, errp);

out:
if (ctx) {
aio_context_release(ctx);
}
aio_context_release(ctx);
}

static void ufs_lu_unrealize(SCSIDevice *dev)
Expand Down
10 changes: 5 additions & 5 deletions hw/ufs/ufs.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static void ufs_irq_check(UfsHc *u)

static void ufs_process_db(UfsHc *u, uint32_t val)
{
unsigned long doorbell;
DECLARE_BITMAP(doorbell, UFS_MAX_NUTRS);
uint32_t slot;
uint32_t nutrs = u->params.nutrs;
UfsRequest *req;
Expand All @@ -268,8 +268,8 @@ static void ufs_process_db(UfsHc *u, uint32_t val)
return;
}

doorbell = val;
slot = find_first_bit(&doorbell, nutrs);
doorbell[0] = val;
slot = find_first_bit(doorbell, nutrs);

while (slot < nutrs) {
req = &u->req_list[slot];
Expand All @@ -285,7 +285,7 @@ static void ufs_process_db(UfsHc *u, uint32_t val)

trace_ufs_process_db(slot);
req->state = UFS_REQUEST_READY;
slot = find_next_bit(&doorbell, nutrs, slot + 1);
slot = find_next_bit(doorbell, nutrs, slot + 1);
}

qemu_bh_schedule(u->doorbell_bh);
Expand Down Expand Up @@ -838,7 +838,7 @@ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
uint8_t lun = req->req_upiu.qr.index;

if (lun != UFS_UPIU_RPMB_WLUN &&
(lun > UFS_MAX_LUS || u->lus[lun] == NULL)) {
(lun >= UFS_MAX_LUS || u->lus[lun] == NULL)) {
trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
return UFS_QUERY_RESULT_INVALID_INDEX;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/ufs-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ static void ufstest_read_write(void *obj, void *data, QGuestAllocator *alloc)
g_assert_cmpuint(block_size, ==, 4096);

/* Write data */
memset(write_buf, rand() % 255 + 1, block_size);
memset(write_buf, 0xab, block_size);
ufs_send_scsi_command(ufs, 0, 1, write_cdb, write_buf, block_size, NULL, 0,
&utrd, &rsp_upiu);
g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, UFS_OCS_SUCCESS);
Expand Down

0 comments on commit 97970da

Please sign in to comment.