From patchwork Thu Mar 11 23:33:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 12133271 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C264C4332D for ; Thu, 11 Mar 2021 23:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 455B764F93 for ; Thu, 11 Mar 2021 23:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229827AbhCKXeS (ORCPT ); Thu, 11 Mar 2021 18:34:18 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:48130 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbhCKXeC (ORCPT ); Thu, 11 Mar 2021 18:34:02 -0500 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lKUoZ-0006cl-M1; Thu, 11 Mar 2021 23:33:59 +0000 From: Colin King To: Doug Gilbert , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] scsi: sg: return -ENOMEM on out of memory error Date: Thu, 11 Mar 2021 23:33:59 +0000 Message-Id: <20210311233359.81305-1-colin.king@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Colin Ian King 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 Acked-by: Douglas Gilbert --- 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;