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 C66E7C433EF for ; Sun, 8 Sep 2019 13:01:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95D542082C for ; Sun, 8 Sep 2019 13:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947671; bh=YRrPemDElYE2BQ99Hoa7t0QckQoqDn3L4miAj+9x7LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YS6JztzYNRxV9p3w3KLF2j6JNdApWpujZMThlRIopC6yVdCdsoOogFE1BPeTygYlw T3NTVTVcCU1VxHDJaZzy1PYKQYD8i57+vQMxHszm6N/WeMthPgyJOcDkZ7PLnnSEXF MqQ+EiiAEMr3jCqixb75aSbSFrCrLqEZ8N4fA0No= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729477AbfIHMn2 (ORCPT ); Sun, 8 Sep 2019 08:43:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:57162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726229AbfIHMnZ (ORCPT ); Sun, 8 Sep 2019 08:43:25 -0400 Received: from localhost (unknown [62.28.240.114]) (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 6B484218AF; Sun, 8 Sep 2019 12:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946604; bh=YRrPemDElYE2BQ99Hoa7t0QckQoqDn3L4miAj+9x7LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vA2TnnTJy1iQaRyeJspINS5MSG4NWzSR0LSLWUuLAtDoRQC4mTdLRdZ/mhsRlbLI/ TeMadWdnzeqKo0cOYT3KvYrzYDg45mxfea2DV8S7zJ2J/t/JB6WTTbkgUHQim8E23h dK3dlr8Up7KV+TcNL+yPYlszQ3C9mGDdidX2wgSc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 09/23] net: kalmia: fix memory leaks Date: Sun, 8 Sep 2019 13:41:44 +0100 Message-Id: <20190908121056.700368519@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121052.898169328@linuxfoundation.org> References: <20190908121052.898169328@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 f1472cb09f11ddb41d4be84f0650835cb65a9073 ] In kalmia_init_and_get_ethernet_addr(), 'usb_buf' is allocated through kmalloc(). In the following execution, if the 'status' returned by kalmia_send_init_packet() is not 0, 'usb_buf' is not deallocated, leading to memory leaks. To fix this issue, add the 'out' label to free 'usb_buf'. Signed-off-by: Wenwen Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/kalmia.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c index 5662babf05832..d385b67258c79 100644 --- a/drivers/net/usb/kalmia.c +++ b/drivers/net/usb/kalmia.c @@ -117,16 +117,16 @@ kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_1) / sizeof(init_msg_1[0]), usb_buf, 24); if (status != 0) - return status; + goto out; memcpy(usb_buf, init_msg_2, 12); status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_2) / sizeof(init_msg_2[0]), usb_buf, 28); if (status != 0) - return status; + goto out; memcpy(ethernet_addr, usb_buf + 10, ETH_ALEN); - +out: kfree(usb_buf); return status; } -- 2.20.1