Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp801940pxf; Thu, 11 Mar 2021 15:35:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWoDXFsirzKAu+IEi44yCuigkGG6hsEytE65essEQ4Z287c0ZSLbelUu2FOXsDQTL3L/lP X-Received: by 2002:a17:906:cb0a:: with SMTP id lk10mr857030ejb.479.1615505737699; Thu, 11 Mar 2021 15:35:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615505737; cv=none; d=google.com; s=arc-20160816; b=Ty0clBGIDDPw7+6jINaPM1q4GKlPUcxpwM5AENOJtdAL2QB6nWZDKKDff7cZPhg14B ZtNgQxUL1NnMjptBNzQGUBOuYn/1/v5WA0w9aS588UXgl/4IWSqGVXK+Q3kyGjXJZE2Q 8VpnKSDiQGxNeRNKEz1OdoI9Fy9OfdmaNrGLNnDj6pjF+5CkqDsGMe1RO1AMUxxHYypn SkhbvK8gKvxh0KB1R0UV57424XHZieiqU+4C0ttEkN6vkGRBVRN74GRWyZwmt/nY+9YU 8JekDu8PIof2+OavKblbWkCtGJU+P4l9pz1ClFUD6eqgPDbF794lVYanF8Qa8+KhGvMr hooQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=bDcXJJr2dkjEsrsrOkmlRIjj5jdscWUH1kph+jslUP8=; b=Vg5OieoJ6sXumm6kbzGEjS3JM/JoxHg/sK/gWKm+9DHdTpGjGYjUSrRiBee1lgkwDC iX4194SD8xPsdWiTRYSBESIEtKTa9v+fzzUpSFv4M6isRVZiht8Y61hZZoPGfA8R70/s vDATh9NMiZkq1Vmp6Te4wnOxmmPZwV0w/8UikVRa2DBagPDHEWop6RIrkKfxywETis8M TCXjgrBPi2+2abFWa3SRgKUw73HMJDsSmxN77Tpdmiku7wiaAgufli4chhcA3vbuVA6S JiBHbnEOZ5Lz/SsLBr7kPZvmPsBzYogth7vYta+whlW/3OJt1EWgp03dcFr8egpqJp2U 1HbA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t8si2811547edq.232.2021.03.11.15.35.14; Thu, 11 Mar 2021 15:35:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229526AbhCKXeS (ORCPT + 99 others); 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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