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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 CCFCAC432C0 for ; Wed, 27 Nov 2019 21:12:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A239B2176D for ; Wed, 27 Nov 2019 21:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889127; bh=zc7BnLtXFd9KY/qRc2u8Z/fOI2FZydNyX+dEWOxr1s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kBKHIdPvzmM4JoWSEJfJ6QTrUZ86GE4Yx/K6ctuFvHmpMwxooXg4wx+7xQb+PxEq2 AV+RRQktW1Rxj+8K9v35f9K7GIDdPIQpao0bFLtAWS4oZXnMZNWP74iYK9MpUTgO9E pzRnOQC7oXug3m7KAkUwPF1I2om+8825OHOM1Zgw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731165AbfK0VMF (ORCPT ); Wed, 27 Nov 2019 16:12:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:41914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731131AbfK0VMD (ORCPT ); Wed, 27 Nov 2019 16:12:03 -0500 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 2BB6521843; Wed, 27 Nov 2019 21:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889122; bh=zc7BnLtXFd9KY/qRc2u8Z/fOI2FZydNyX+dEWOxr1s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VU6Ds5vyG7UXVJ1iPeLFM6725CsPwt/3itn13wRaHO2ZPjOYRa6lRup2vMmZZaW8l eVbdqootpxhuwUOqJbTfusmq2XyroeG4715f5bQ05dKEH2QDZE1q9lMLzeQsjn09Rh 200bBIbL1KdRU8vbiavymkcRo6xFsro4pJEFCZ60= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Navid Emamdoost , Jens Axboe Subject: [PATCH 5.3 49/95] nbd: prevent memory leak Date: Wed, 27 Nov 2019 21:32:06 +0100 Message-Id: <20191127202915.422287215@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@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 From: Navid Emamdoost commit 03bf73c315edca28f47451913177e14cd040a216 upstream. In nbd_add_socket when krealloc succeeds, if nsock's allocation fail the reallocted memory is leak. The correct behaviour should be assigning the reallocted memory to config->socks right after success. Reviewed-by: Josef Bacik Signed-off-by: Navid Emamdoost Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/block/nbd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -995,14 +995,15 @@ static int nbd_add_socket(struct nbd_dev sockfd_put(sock); return -ENOMEM; } + + config->socks = socks; + nsock = kzalloc(sizeof(struct nbd_sock), GFP_KERNEL); if (!nsock) { sockfd_put(sock); return -ENOMEM; } - config->socks = socks; - nsock->fallback_index = -1; nsock->dead = false; mutex_init(&nsock->tx_lock);