Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3946782pxk; Tue, 8 Sep 2020 06:54:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhAeZHwwAnB6y1lPx66m8ClhvY1tiyM8KY1OwD39pTlRj/OT+iO622a4XkpCskGxWrSBqw X-Received: by 2002:a17:906:6d4c:: with SMTP id a12mr25151954ejt.64.1599573281896; Tue, 08 Sep 2020 06:54:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599573281; cv=none; d=google.com; s=arc-20160816; b=Vi8GM9iPekRTkQbeW3DXnwoM7/EUz99deeME0moYjVXbCCC/yiz6IdBql/Az4R/BZK whHiHC7wHS40dgdaSdXjQNyfijzmRAOeE9R5mDlSNKcsQNcsurSbHd9MaVv+Kt83fRyX PWY8yUc4Ull0HhQ8t9FQ+VJfLYFtkD0Nl4CkohhUnkKE5T9Z+OkDEZ1F2RwTZum5Ta+x BiOvXv18fqXRAqQsBE+QbSc4pqEfn+PwH1gn+hebHlUMrUD4PkEXe7fVg0DjfsDZjPJM 8jmf20coGrBz/gf6lVeFXRVFa5isvtQiBTPmh+TBlYaYnZKRQ6XeM3jdQ3+4siCMKIy9 oJYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:message-id:date:subject:cc:from :dkim-signature; bh=ehTU8VuqCe4uQqnVpDe9geOxORvh8qag6CqSgGb/x38=; b=ohFkoGur4lyqpGlGPpk8wt8mu1jM4wgcz5UeHkcgTKoW9cm4R0Y9ghzzyT/jqvDwWM gaHHZoCS0kLZc/ucMdPWNg8MMnHfcC0IL4r/o5ZX/UnS35PfXESHXj5jJCOCQz9dKW0+ DKhDKwC7/5tCoy8QjzNFZBBd+OuV0xkp9F2y9B8RF4TlW22hDu1q5raYfVME+zKKWBg6 Fj5QgxtHJb/MAn18jcaRoCWbmfrmpUeOXC7aBCQP8m3CvTnkLmc7aFwnY0QbdG6i1uH1 ymTFRwYlsojMah7vTHiiFVbwdKJVy0JbMc1ZEG8wBfx+1nmJ4I/R8cxi1cfsp2OtmaxA +ptw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sslab.ics.keio.ac.jp header.s=google header.b=XXNR65cR; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i11si11563244edl.389.2020.09.08.06.54.04; Tue, 08 Sep 2020 06:54:41 -0700 (PDT) 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; dkim=fail header.i=@sslab.ics.keio.ac.jp header.s=google header.b=XXNR65cR; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729622AbgIHNsB (ORCPT + 99 others); Tue, 8 Sep 2020 09:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729875AbgIHNmM (ORCPT ); Tue, 8 Sep 2020 09:42:12 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07603C0619C3 for ; Tue, 8 Sep 2020 06:36:12 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id 34so636033pgo.13 for ; Tue, 08 Sep 2020 06:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sslab.ics.keio.ac.jp; s=google; h=from:to:cc:subject:date:message-id; bh=ehTU8VuqCe4uQqnVpDe9geOxORvh8qag6CqSgGb/x38=; b=XXNR65cRXkVSPXHNMlGccTpQI7cOqRyhk5d8MsIws07AR035m+bxTug70SDBbKciK5 2lYRSm8fhoP+SbAUu7pr7CorYMYDf8ArGi3ZDTGpK4TqR6w3vHrr/iW4tbDJwhKJjYVE ryBEybf6RG9DjezNonEi/3yWFDJBF0DAYhs6k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ehTU8VuqCe4uQqnVpDe9geOxORvh8qag6CqSgGb/x38=; b=tSJ1TdGmRNGAU2GHXQcyu2xSTwtkXGsBLDgW5gkpdIFlUqY79HR5izjaHx4uk5okIm x9zN7tRHCDxUVq13MFcSOc8P65Y2P3KC9disyQSwWMdLXWfveEyp2IW810qLGngwC0q6 6j9tEoAjNWd/wGAB9qZxZ0UBA2wHBGiRjJBtGRS4O2KsNFNQp4j2Un/raFLotyaVLJ/7 7vw8DMXTynTmirJqL+vtn50XJq3tITIPocNHg0hvOmVQO2e7OuzrEqAGos7THlQiwXIY zf6RrwZpGKIb+6sWK9NzRd0OUM+pK1uZQf7Iw+nVaylhN+IdIHaMlM7CqPxbuq4tEzua MXcQ== X-Gm-Message-State: AOAM533OhPCeNfGHcYKL9+HEf7bznPx7tbqGx11AXWfepb2PuYOrjIF5 /+hfZlhsysYc6ClCcDOPdDU3SA== X-Received: by 2002:a17:902:c410:: with SMTP id k16mr24241546plk.123.1599572171471; Tue, 08 Sep 2020 06:36:11 -0700 (PDT) Received: from brooklyn.i.sslab.ics.keio.ac.jp (sslab-relay.ics.keio.ac.jp. [131.113.126.173]) by smtp.googlemail.com with ESMTPSA id b20sm19856758pfb.198.2020.09.08.06.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 06:36:10 -0700 (PDT) From: Keita Suzuki Cc: keitasuzuki.park@sslab.ics.keio.ac.jp, takafumi@sslab.ics.keio.ac.jp, Don Brace , "James E.J. Bottomley" , "Martin K. Petersen" , esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: hpsa: fix memory leak in hpsa_init_one Date: Tue, 8 Sep 2020 13:35:32 +0000 Message-Id: <20200908133533.16744-1-keitasuzuki.park@sslab.ics.keio.ac.jp> X-Mailer: git-send-email 2.17.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When hpsa_scsi_add_host fails, h->lastlogicals is leaked since it lacks free in the error handler. Fix this by adding free when hpsa_scsi_add_host fails. Signed-off-by: Keita Suzuki --- drivers/scsi/hpsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 48d5da59262b..aed59ec20ad9 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -8854,7 +8854,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* hook into SCSI subsystem */ rc = hpsa_scsi_add_host(h); if (rc) - goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h */ + goto clean8; /* lastlogicals, perf, sg, cmd, irq, shost, pci, lu, aer/h */ /* Monitor the controller for firmware lockups */ h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL; @@ -8869,6 +8869,8 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) HPSA_EVENT_MONITOR_INTERVAL); return 0; +clean8: /* lastlogicals, perf, sg, cmd, irq, shost, pci, lu, aer/h */ + kfree(h->lastlogicals); clean7: /* perf, sg, cmd, irq, shost, pci, lu, aer/h */ hpsa_free_performant_mode(h); h->access.set_intr_mask(h, HPSA_INTR_OFF); -- 2.17.1