Skip to content

Commit a0fde51

Browse files
maurizio-lombardimartinkpetersen
authored andcommitted
scsi: target: core: Fix invalid memory access
nr_attrs should start counting from zero, otherwise we will end up dereferencing an invalid memory address. $ targetcli /loopback create general protection fault RIP: 0010:configfs_create_file+0x12/0x70 Call Trace: <TASK> configfs_attach_item.part.0+0x5f/0x150 configfs_attach_group.isra.0+0x49/0x120 configfs_mkdir+0x24f/0x4d0 vfs_mkdir+0x192/0x240 do_mkdirat+0x131/0x160 __x64_sys_mkdir+0x48/0x70 do_syscall_64+0x5c/0x90 Fixes: 31177b7 ("scsi: target: core: Add RTPI attribute for target port") Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> Link: https://lore.kernel.org/r/20230407130033.556644-1-mlombard@redhat.com Acked-by: Dmitry Bogdanov <d.bogdanov@yadro.com> Reviewed-by: Mike Christie <michael.christie@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent dc70c96 commit a0fde51

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/target/target_core_fabric_configfs.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
885885
{
886886
struct config_item_type *cit = &tf->tf_tpg_base_cit;
887887
struct configfs_attribute **attrs = NULL;
888-
size_t nr_attrs = 1;
888+
size_t nr_attrs = 0;
889889
int i = 0;
890890

891891
if (tf->tf_ops->tfc_tpg_base_attrs)
@@ -895,8 +895,8 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
895895
if (tf->tf_ops->fabric_enable_tpg)
896896
nr_attrs++;
897897

898-
if (nr_attrs == 0)
899-
goto done;
898+
/* + 1 for target_fabric_tpg_base_attr_rtpi */
899+
nr_attrs++;
900900

901901
/* + 1 for final NULL in the array */
902902
attrs = kcalloc(nr_attrs + 1, sizeof(*attrs), GFP_KERNEL);
@@ -912,7 +912,6 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
912912

913913
attrs[i++] = &target_fabric_tpg_base_attr_rtpi;
914914

915-
done:
916915
cit->ct_item_ops = &target_fabric_tpg_base_item_ops;
917916
cit->ct_attrs = attrs;
918917
cit->ct_owner = tf->tf_ops->module;

0 commit comments

Comments
 (0)