From patchwork Thu Sep 7 11:54:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9942169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D369602B3 for ; Thu, 7 Sep 2017 11:54:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A5B928660 for ; Thu, 7 Sep 2017 11:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F2F82866A; Thu, 7 Sep 2017 11:54:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E7E42866F for ; Thu, 7 Sep 2017 11:54:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755228AbdIGLys (ORCPT ); Thu, 7 Sep 2017 07:54:48 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:34953 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754982AbdIGLyq (ORCPT ); Thu, 7 Sep 2017 07:54:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=AzujLkCEsF+6ehgWLf7G0T6hfxxGVBS90a7OaEh6Zto=; b=FUSqvehypXncqQ9cUku33YJle hiFRNS7wAqYyHzsWen9rYBkzoFH/6q1dEHerKlcJOmpj7RTSp4IL3hlfu0t4eCjSmnF1XG/uTDpgc Fr7CerJtKfnCiVX3hwxXRfopvaCTp4MD7VgfEhCFMBuJbSThJIZDoXa5XlKPIAXhJ0RZVPOntdakq ZodoJeOc3y6yS4IWVhjyrs/tXDx31daBrcea4XG+9L/sNYhhbZLckk/GLc4cCWRB+SU4s2j/8Hfdn IWw79gnYiTaBjmaYreBTAs6HnC87hdQWiGS+txRFEl69KdQL/qv5lB7RgK3km+ITMV2bHGe8ATL9k ThiehK4Qg==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dpvOO-00013w-PR; Thu, 07 Sep 2017 11:54:45 +0000 From: Christoph Hellwig To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/2] bsg-lib: don't free job in bsg_prepare_job Date: Thu, 7 Sep 2017 13:54:35 +0200 Message-Id: <20170907115436.5069-2-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170907115436.5069-1-hch@lst.de> References: <20170907115436.5069-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The job structure is allocated as part of the request, so we should not free it in the error path of bsg_prepare_job. Signed-off-by: Christoph Hellwig Cc: stable@vger.kernel.org Reviewed-by: Ming Lei --- block/bsg-lib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/bsg-lib.c b/block/bsg-lib.c index dd56d7460cb9..c587c71d78af 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -154,7 +154,6 @@ static int bsg_prepare_job(struct device *dev, struct request *req) failjob_rls_rqst_payload: kfree(job->request_payload.sg_list); failjob_rls_job: - kfree(job); return -ENOMEM; }