2021-03-11 23:35:37

by Colin King

Subject: [PATCH][next] scsi: sg: return -ENOMEM on out of memory error

From: Colin Ian King <[email protected]>

The sg_proc_seq_show_debug should return -ENOMEM on an
out of memory error rather than -1. Fix this.

Fixes: 94cda6cf2e44 ("scsi: sg: Rework debug info")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/scsi/sg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 79f05afa4407..85e86cbc6891 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -4353,7 +4353,7 @@ sg_proc_seq_show_debug(struct seq_file *s, void *v)
if (!bp) {
seq_printf(s, "%s: Unable to allocate %d on heap, finish\n",
__func__, bp_len);
- return -1;
+ return -ENOMEM;
}
read_lock_irqsave(&sg_index_lock, iflags);
sdp = it ? sg_lookup_dev(it->index) : NULL;
--
2.30.2

2021-03-12 02:34:22

by Douglas Gilbert

Subject: Re: [PATCH][next] scsi: sg: return -ENOMEM on out of memory error

On 2021-03-11 6:33 p.m., Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> The sg_proc_seq_show_debug should return -ENOMEM on an
> out of memory error rather than -1. Fix this.
>
> Fixes: 94cda6cf2e44 ("scsi: sg: Rework debug info")
> Signed-off-by: Colin Ian King <[email protected]>

Acked-by: Douglas Gilbert <[email protected]>

Thanks.

> ---
> drivers/scsi/sg.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index 79f05afa4407..85e86cbc6891 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -4353,7 +4353,7 @@ sg_proc_seq_show_debug(struct seq_file *s, void *v)
> if (!bp) {
> seq_printf(s, "%s: Unable to allocate %d on heap, finish\n",
> __func__, bp_len);
> - return -1;
> + return -ENOMEM;
> }
> read_lock_irqsave(&sg_index_lock, iflags);
> sdp = it ? sg_lookup_dev(it->index) : NULL;
>