tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds a765b9e6 11313e2f

+6 -3
+3 -2
drivers/scsi/elx/efct/efct_hw.c
··· 1120 1120 efct_hw_parse_filter(struct efct_hw *hw, void *value) 1121 1121 { 1122 1122 int rc = 0; 1123 - char *p = NULL; 1123 + char *p = NULL, *pp = NULL; 1124 1124 char *token; 1125 1125 u32 idx = 0; 1126 1126 ··· 1132 1132 efc_log_err(hw->os, "p is NULL\n"); 1133 1133 return -ENOMEM; 1134 1134 } 1135 + pp = p; 1135 1136 1136 1137 idx = 0; 1137 1138 while ((token = strsep(&p, ",")) && *token) { ··· 1145 1144 if (idx == ARRAY_SIZE(hw->config.filter_def)) 1146 1145 break; 1147 1146 } 1148 - kfree(p); 1147 + kfree(pp); 1149 1148 1150 1149 return rc; 1151 1150 }
+3 -1
drivers/target/target_core_pr.c
··· 1842 1842 } 1843 1843 1844 1844 kmem_cache_free(t10_pr_reg_cache, dest_pr_reg); 1845 - core_scsi3_lunacl_undepend_item(dest_se_deve); 1845 + 1846 + if (dest_se_deve) 1847 + core_scsi3_lunacl_undepend_item(dest_se_deve); 1846 1848 1847 1849 if (is_local) 1848 1850 continue;