inifiniband: ucaps: avoid format-security warning
PATCH 1/1 inifiniband: ucaps: avoid format-security warning
From: Arnd Bergmann <[email protected]>
Passing a non-constant format string to dev_set_name causes a warning:
drivers/infiniband/core/ucaps.c:173:33: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
173 | ret = dev_set_name(&ucap->dev, ucap_names[type]);
| ^~~~~~~~~~~~~~~~
drivers/infiniband/core/ucaps.c:173:33: note: treat the string as an argument to avoid this
173 | ret = dev_set_name(&ucap->dev, ucap_names[type]);
| ^
| "%s",Turn the name into thet %s argument as suggested by gcc.
--- drivers/infiniband/core/ucaps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/ucaps.c +1 -1
@@ -170,7 +170,7 @@ int ib_create_ucap(enum rdma_user_cap type) ucap->dev.class = &ucaps_class; ucap->dev.devt =MKDEV (MAJOR (ucaps_base_dev), type); ucap->dev.release = ucap_dev_release; - ret =dev_set_name (&ucap->dev, ucap_names[type]); + ret =dev_set_name (&ucap->dev,"%s" , ucap_names[type]);if (ret) goto err_device;
Signature · 1 line
2.39.5
Quoted 12 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Passing a non-constant format string to
dev_set_namecauses a warning:
drivers/infiniband/core/ucaps.c:173:33: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^~~~~~~~~~~~~~~~ drivers/infiniband/core/ucaps.c:173:33: note: treat the string as an argument to avoid this 173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^ | "%s",
Quoted 3 lines
Turn the name into thet %s argument as suggested by gcc.
Fixes 61e51682816d ("RDMA/uverbs: Introduce UCAP (User CAPabilities) API")
This patch should be for linux-next. In the subject, linux-next should be added.
Except the above, I am fine with this commit.
Zhu Yanjun
Quoted 18 lines
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/infiniband/core/ucaps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/infiniband/core/ucaps.c +1
-1@@ -170,7 +170,7 @@ int ib_create_ucap(enum rdma_user_cap type) ucap->dev.class = &ucaps_class; ucap->dev.devt =MKDEV (MAJOR (ucaps_base_dev), type); ucap->dev.release = ucap_dev_release; - ret =dev_set_name (&ucap->dev, ucap_names[type]); + ret =dev_set_name (&ucap->dev,"%s" , ucap_names[type]);if (ret) goto err_device;
Signature · 2 lines
Best Regards, Yanjun.Zhu
Quoted 12 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Passing a non-constant format string to
dev_set_namecauses a warning:
drivers/infiniband/core/ucaps.c:173:33: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^~~~~~~~~~~~~~~~ drivers/infiniband/core/ucaps.c:173:33: note: treat the string as an argument to avoid this 173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^ | "%s",
Quoted 7 lines
Turn the name into thet %s argument as suggested by gcc.
Fixes 61e51682816d ("RDMA/uverbs: Introduce UCAP (User CAPabilities) API")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/infiniband/core/ucaps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Why don't you change ucap_names[] declaration instead?
drivers/infiniband/core/ucaps.c +1 -1
@@ -23,7 +23,7 @@ struct ib_ucap {struct kref ref; }; -static const char *ucap_names[RDMA_UCAP_MAX ] = { +static const char *const ucap_names[RDMA_UCAP_MAX ] = { [RDMA_UCAP_MLX5_CTRL_LOCAL ] ="mlx5_perm_ctrl_local" , [RDMA_UCAP_MLX5_CTRL_OTHER_VHCA ] ="mlx5_perm_ctrl_other_vhca" };
(END)
Thanks
Quoted 17 lines
drivers/infiniband/core/ucaps.c +1
-1@@ -170,7 +170,7 @@ int ib_create_ucap(enum rdma_user_cap type) ucap->dev.class = &ucaps_class; ucap->dev.devt =MKDEV (MAJOR (ucaps_base_dev), type); ucap->dev.release = ucap_dev_release; - ret =dev_set_name (&ucap->dev, ucap_names[type]); + ret =dev_set_name (&ucap->dev,"%s" , ucap_names[type]);if (ret) goto err_device;Signature · 1 line
2.39.5
Quoted 28 lines · Leon Romanovsky
Quoted 12 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Passing a non-constant format string to
dev_set_namecauses a warning:
drivers/infiniband/core/ucaps.c:173:33: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^~~~~~~~~~~~~~~~ drivers/infiniband/core/ucaps.c:173:33: note: treat the string as an argument to avoid this 173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^ | "%s",Quoted 7 lines
Turn the name into thet %s argument as suggested by gcc.
Fixes 61e51682816d ("RDMA/uverbs: Introduce UCAP (User CAPabilities) API")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/infiniband/core/ucaps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Why don't you change ucap_names[] declaration instead?
drivers/infiniband/core/ucaps.c +0
-0
drivers/infiniband/core/ucaps.c struct ib_ucap { · line 29
Quoted 8 lines
drivers/infiniband/core/ucaps.c +1
-1@@ -23,7 +23,7 @@ struct ib_ucap {struct kref ref; }; -static const char *ucap_names[RDMA_UCAP_MAX ] = { +static const char *const ucap_names[RDMA_UCAP_MAX ] = { [RDMA_UCAP_MLX5_CTRL_LOCAL ] ="mlx5_perm_ctrl_local" , [RDMA_UCAP_MLX5_CTRL_OTHER_VHCA ] ="mlx5_perm_ctrl_other_vhca" };
This should be done anyone, but it won't fix the warning. gcc is worried that the format string could have an embedded "%XXX" or something that would cause stack corruption. It is a security error to push user controlled data into the format string. This isn't happening here, but silencing gcc will need the %s.
For both
Jason
Quoted 14 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Passing a non-constant format string to
dev_set_namecauses a warning:
drivers/infiniband/core/ucaps.c:173:33: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^~~~~~~~~~~~~~~~ drivers/infiniband/core/ucaps.c:173:33: note: treat the string as an argument to avoid this 173 | ret = dev_set_name(&ucap->dev, ucap_names[type]); | ^ | "%s",Turn the name into thet %s argument as suggested by gcc.
Quoted 7 lines
Fixes 61e51682816d ("RDMA/uverbs: Introduce UCAP (User CAPabilities) API")Signed-off-by Arnd Bergmann <[email protected]>Reviewed-by Zhu Yanjun <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>--- drivers/infiniband/core/ucaps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to for-rc, thanks
Jason