Skip to contentSkip to conversation

target: core: fix invalid memory access

PATCH Applied Maurizio Lombardi 4 participants 4 messages Apr 7, 2023 – Apr 12, 2023 SCSI target

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 31177b74790c ("scsi: target: core: Add RTPI attribute for target port")
---
 drivers/target/target_core_fabric_configfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/target/target_core_fabric_configfs.c +3 -4
index 0ce47e21e0c8..b7c637644cd4 100644
@@ -885,7 +885,7 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
 {
 	struct config_item_type *cit = &tf->tf_tpg_base_cit;
 	struct configfs_attribute **attrs = NULL;
-	size_t nr_attrs = 1;
+	size_t nr_attrs = 0;
 	int i = 0;
 
 	if (tf->tf_ops->tfc_tpg_base_attrs)
@@ -895,8 +895,8 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
 	if (tf->tf_ops->fabric_enable_tpg)
 		nr_attrs++;
 
-	if (nr_attrs == 0)
-		goto done;
+	/* + 1 for target_fabric_tpg_base_attr_rtpi */
+	nr_attrs++;
 
 	/* + 1 for final NULL in the array */
 	attrs = kcalloc(nr_attrs + 1, sizeof(*attrs), GFP_KERNEL);
@@ -912,7 +912,6 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
 
 	attrs[i++] = &target_fabric_tpg_base_attr_rtpi;
 
-done:
 	cit->ct_item_ops = &target_fabric_tpg_base_item_ops;
 	cit->ct_attrs = attrs;
 	cit->ct_owner = tf->tf_ops->module;
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Maurizio Lombardi
Quoted 49 lines · Maurizio Lombardi

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 31177b74790c ("scsi: target: core: Add RTPI attribute for target port")
---
 drivers/target/target_core_fabric_configfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/target/target_core_fabric_configfs.c +3 -3
index 0ce47e21e0c8..b7c637644cd4 100644
@@ -885,7 +885,7 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
 {
 	struct config_item_type *cit = &tf->tf_tpg_base_cit;
 	struct configfs_attribute **attrs = NULL;
-	size_t nr_attrs = 1;
+	size_t nr_attrs = 0;
 	int i = 0;
 
 	if (tf->tf_ops->tfc_tpg_base_attrs)
@@ -895,8 +895,8 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
 	if (tf->tf_ops->fabric_enable_tpg)
 		nr_attrs++;
 
-	if (nr_attrs == 0)
-		goto done;
+	/* + 1 for target_fabric_tpg_base_attr_rtpi */
+	nr_attrs++;
 
 	/* + 1 for final NULL in the array */
 	attrs = kcalloc(nr_attrs + 1, sizeof(*attrs), GFP_KERNEL);

drivers/target/target_core_fabric_configfs.c target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf) · line 917

Quoted 7 lines
drivers/target/target_core_fabric_configfs.c +0 -1
@@ -912,7 +912,6 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
 
 	attrs[i++] = &target_fabric_tpg_base_attr_rtpi;
 
-done:
 	cit->ct_item_ops = &target_fabric_tpg_base_item_ops;
 	cit->ct_attrs = attrs;
 	cit->ct_owner = tf->tf_ops->module;
#3 lore raw
In reply to Maurizio Lombardi

Maurizio,

Quoted 2 lines

nr_attrs should start counting from zero, otherwise we will end up dereferencing an invalid memory address.

Applied to 6.4/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering