* [PATCH] scsi: target: reset t_task_cdb pointer in error case
@ 2025-11-18 8:42 Ваторопин Андрей
2025-11-18 19:57 ` Mike Christie
0 siblings, 1 reply; 2+ messages in thread
From: Ваторопин Андрей @ 2025-11-18 8:42 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Ваторопин
Андрей,
Sudhakar Panneerselvam, Mike Christie, linux-scsi, target-devel,
linux-kernel, lvc-project, stable
From: Andrey Vatoropin <a.vatoropin@crpt.ru>
If allocation of cmd->t_task_cdb fails, it remains NULL but is later
dereferenced at the 'err' path.
In case of error reset NULL t_task_cdb value to point at the default
fixed-size buffer.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 9e95fb805dc0 ("scsi: target: Fix NULL pointer dereference")
Cc: stable@vger.kernel.org
Signed-off-by: Andrey Vatoropin <a.vatoropin@crpt.ru>
---
drivers/target/target_core_transport.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 0a76bdfe5528..88544c911949 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1524,6 +1524,7 @@ target_cmd_init_cdb(struct se_cmd *cmd, unsigned char *cdb, gfp_t gfp)
if (scsi_command_size(cdb) > sizeof(cmd->__t_task_cdb)) {
cmd->t_task_cdb = kzalloc(scsi_command_size(cdb), gfp);
if (!cmd->t_task_cdb) {
+ cmd->t_task_cdb = &cmd->__t_task_cdb[0];
pr_err("Unable to allocate cmd->t_task_cdb"
" %u > sizeof(cmd->__t_task_cdb): %lu ops\n",
scsi_command_size(cdb),
--
2.43.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] scsi: target: reset t_task_cdb pointer in error case
2025-11-18 8:42 [PATCH] scsi: target: reset t_task_cdb pointer in error case Ваторопин Андрей
@ 2025-11-18 19:57 ` Mike Christie
0 siblings, 0 replies; 2+ messages in thread
From: Mike Christie @ 2025-11-18 19:57 UTC (permalink / raw)
To: Ваторопин
Андрей,
Martin K. Petersen
Cc: Sudhakar Panneerselvam, linux-scsi, target-devel, linux-kernel,
lvc-project, stable
On 11/18/25 2:42 AM, Ваторопин Андрей wrote:
> From: Andrey Vatoropin <a.vatoropin@crpt.ru>
>
> If allocation of cmd->t_task_cdb fails, it remains NULL but is later
> dereferenced at the 'err' path.
>
> In case of error reset NULL t_task_cdb value to point at the default
> fixed-size buffer.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 9e95fb805dc0 ("scsi: target: Fix NULL pointer dereference")
> Cc: stable@vger.kernel.org
> Signed-off-by: Andrey Vatoropin <a.vatoropin@crpt.ru>
> ---
> drivers/target/target_core_transport.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
> index 0a76bdfe5528..88544c911949 100644
> --- a/drivers/target/target_core_transport.c
> +++ b/drivers/target/target_core_transport.c
> @@ -1524,6 +1524,7 @@ target_cmd_init_cdb(struct se_cmd *cmd, unsigned char *cdb, gfp_t gfp)
> if (scsi_command_size(cdb) > sizeof(cmd->__t_task_cdb)) {
> cmd->t_task_cdb = kzalloc(scsi_command_size(cdb), gfp);
> if (!cmd->t_task_cdb) {
> + cmd->t_task_cdb = &cmd->__t_task_cdb[0];
> pr_err("Unable to allocate cmd->t_task_cdb"
> " %u > sizeof(cmd->__t_task_cdb): %lu ops\n",
> scsi_command_size(cdb),
Reviewed-by: Mike Christie <michael.christie@oracle.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-11-18 19:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-18 8:42 [PATCH] scsi: target: reset t_task_cdb pointer in error case Ваторопин Андрей
2025-11-18 19:57 ` Mike Christie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®