projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2dd39fa
)
scsi: qla2xxx: Correct the check for sscanf() return value
author
Saurav Kashyap
<skashyap@marvell.com>
Tue, 29 Sep 2020 10:21:46 +0000
(
03:21
-0700)
committer
Martin K. Petersen
<martin.petersen@oracle.com>
Wed, 30 Sep 2020 03:22:14 +0000
(23:22 -0400)
Since the version string has been modified, sscanf() returns 4 instead of
6.
Link:
https://lore.kernel.org/r/20200929102152.32278-2-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_tmpl.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/qla2xxx/qla_tmpl.c
b/drivers/scsi/qla2xxx/qla_tmpl.c
index 8dc82cfd38b271678de36f325ef6138c68433a24..591df89a4d13fbc061f85d811e66b853384c85a7 100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_tmpl.c
+++ b/
drivers/scsi/qla2xxx/qla_tmpl.c
@@
-906,8
+906,8
@@
qla27xx_driver_info(struct qla27xx_fwdt_template *tmp)
uint8_t v[] = { 0, 0, 0, 0, 0, 0 };
WARN_ON_ONCE(sscanf(qla2x00_version_str,
- "%hhu.%hhu.%hhu.%hhu
.%hhu.%hhu
",
- v
+0, v+1, v+2, v+3, v+4, v+5) != 6
);
+ "%hhu.%hhu.%hhu.%hhu",
+ v
+ 0, v + 1, v + 2, v + 3) != 4
);
tmp->driver_info[0] = cpu_to_le32(
v[3] << 24 | v[2] << 16 | v[1] << 8 | v[0]);