github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

SCSI fixes on 20250620

Browse Source 
Two small and obvious driver fixes.
 
 Signed-off-by: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
 -----BEGIN PGP SIGNATURE-----
 
 iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCaFVmPCYcamFtZXMuYm90
 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishVihAP0f8k3/
 yBL63Mu4H4PemV1Xx70lerRL9lFY/NqrcnZQQQEAmUTHB9Cdb1N3NiYOf0OmNYzd
 BSUIL6zI5lW1aPb8xWY=
 =2iYQ
 -----END PGP SIGNATURE-----

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Two small and obvious driver fixes"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: elx: efct: Fix memory leak in efct_hw_parse_filter()
  scsi: target: Fix NULL pointer dereference in core_scsi3_decode_spec_i_port()
This commit is contained in:
Linus Torvalds 2025-06-20 22:34:52 -07:00
commit a765b9e6db
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/elx/efct/efct_hw.c
View File

@ -1120,7 +1120,7 @@ int
efct_hw_parse_filter(struct efct_hw *hw, void *value)
{
int rc = 0;
char *p = NULL;
char *p = NULL, *pp = NULL;
char *token;
u32 idx = 0;
@ -1132,6 +1132,7 @@ efct_hw_parse_filter(struct efct_hw *hw, void *value)
efc_log_err(hw->os, "p is NULL\n");
return -ENOMEM;
}
pp = p;
idx = 0;
while ((token = strsep(&p, ",")) && *token) {
@ -1144,7 +1145,7 @@ efct_hw_parse_filter(struct efct_hw *hw, void *value)
if (idx == ARRAY_SIZE(hw->config.filter_def))
break;
}
kfree(p);
kfree(pp);
return rc;
}

4
drivers/target/target_core_pr.c
View File

@ -1842,7 +1842,9 @@ core_scsi3_decode_spec_i_port(
}
kmem_cache_free(t10_pr_reg_cache, dest_pr_reg);
core_scsi3_lunacl_undepend_item(dest_se_deve);
if (dest_se_deve)
core_scsi3_lunacl_undepend_item(dest_se_deve);
if (is_local)
continue;