From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 0382BC76186 for ; Mon, 29 Jul 2019 20:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2B75205F4 for ; Mon, 29 Jul 2019 20:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564430872; bh=7TwS66VnkAXcEWwLDrxDGAjg4D9ngN0o0NFESBASDec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dDBqk8jomE4uT47lW4aNJt++/jM+3aG6xCYCobt2GUP0V2WZPfJMgjkHGhMURAaM0 h+KLk3auFKRHw3cb459nylkw6J9yfhjyfujDjaoc5pS3kIN2B2QbcYhfErjDLUgVIx w1WpGFvvRvbo4R/iNGSFMwKWiWoOzisSU0DZznow= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388884AbfG2Tii (ORCPT ); Mon, 29 Jul 2019 15:38:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:53404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388857AbfG2Ti1 (ORCPT ); Mon, 29 Jul 2019 15:38:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DAFF62054F; Mon, 29 Jul 2019 19:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429106; bh=7TwS66VnkAXcEWwLDrxDGAjg4D9ngN0o0NFESBASDec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PSi2kQRdccJ2ieSgrKQ9xv2VhEhHz0t5V+c0GghbQS4m6gbYBfLCzM+jEZD67fKr/ JiMb+yLemTZtr+mT6GYl5KwnsrKskcmT0F6hbLFH0zuWSCdsnlGekZDw6CZOT1Wmnl T8FpUrMS7LWbJM/XmZtZkjlkvSPmea3S1OqdjsRM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ming Lei , "Martin K. Petersen" , Wenwen Wang , Jens Axboe , Sasha Levin Subject: [PATCH 4.14 269/293] block/bio-integrity: fix a memory leak bug Date: Mon, 29 Jul 2019 21:22:40 +0200 Message-Id: <20190729190844.960449333@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190820.321094988@linuxfoundation.org> References: <20190729190820.321094988@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit e7bf90e5afe3aa1d1282c1635a49e17a32c4ecec ] In bio_integrity_prep(), a kernel buffer is allocated through kmalloc() to hold integrity metadata. Later on, the buffer will be attached to the bio structure through bio_integrity_add_page(), which returns the number of bytes of integrity metadata attached. Due to unexpected situations, bio_integrity_add_page() may return 0. As a result, bio_integrity_prep() needs to be terminated with 'false' returned to indicate this error. However, the allocated kernel buffer is not freed on this execution path, leading to a memory leak. To fix this issue, free the allocated buffer before returning from bio_integrity_prep(). Reviewed-by: Ming Lei Acked-by: Martin K. Petersen Signed-off-by: Wenwen Wang Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bio-integrity.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 5df32907ff3b..7f8010662437 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -313,8 +313,12 @@ bool bio_integrity_prep(struct bio *bio) ret = bio_integrity_add_page(bio, virt_to_page(buf), bytes, offset); - if (ret == 0) - return false; + if (ret == 0) { + printk(KERN_ERR "could not attach integrity payload\n"); + kfree(buf); + status = BLK_STS_RESOURCE; + goto err_end_io; + } if (ret < bytes) break; -- 2.20.1