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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 0F849CA9EA9 for ; Fri, 18 Oct 2019 22:05:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C968520679 for ; Fri, 18 Oct 2019 22:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436307; bh=ygm/bLbEKE+ydYb6n27zhUbjztKPi1bevmfl1GTnNCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2ddIlugoqutPK1vAyRLQ8kq22SvLVxkh2vF3NzMtUfRaiF4Y26Wp/nHo/OcOV7ezg vDzosAwNAwjxK3GahkoJGpxz1W0eZzJFR1l1fA0g8dd2bdtfnQuCnJE9zi2Nl/xZXe YoPu01E/tBt+mn4CfDXtnc2RYlwbRgaiVLY8Zs04= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729171AbfJRWFG (ORCPT ); Fri, 18 Oct 2019 18:05:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:36860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729126AbfJRWFD (ORCPT ); Fri, 18 Oct 2019 18:05:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8243A222D4; Fri, 18 Oct 2019 22:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436303; bh=ygm/bLbEKE+ydYb6n27zhUbjztKPi1bevmfl1GTnNCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kltX15avdl3QHp7AYoatQdM1VE4OR7S4GA9c9pzu3EFHBn8PjhYb4ZgUpsmCoRZ/t F1sQ25KBBxqWar64qgjsIVC/pOBiKdzzadUOLpiiAamsbPzlrrnvUxJFVnAz1Zqx9W aOmXNOdCAPwl31WzkeyfTlPIpnh984IwqddrmmyE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Alexandru Ardelean , Jonathan Cameron , Sasha Levin , linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 74/89] iio: imu: adis16400: fix memory leak Date: Fri, 18 Oct 2019 18:03:09 -0400 Message-Id: <20191018220324.8165-74-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220324.8165-1-sashal@kernel.org> References: <20191018220324.8165-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit 9c0530e898f384c5d279bfcebd8bb17af1105873 ] In adis_update_scan_mode_burst, if adis->buffer allocation fails release the adis->xfer. Signed-off-by: Navid Emamdoost Reviewed-by: Alexandru Ardelean Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/imu/adis_buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c index f446ff4978091..4998a89d083d5 100644 --- a/drivers/iio/imu/adis_buffer.c +++ b/drivers/iio/imu/adis_buffer.c @@ -35,8 +35,11 @@ static int adis_update_scan_mode_burst(struct iio_dev *indio_dev, return -ENOMEM; adis->buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL); - if (!adis->buffer) + if (!adis->buffer) { + kfree(adis->xfer); + adis->xfer = NULL; return -ENOMEM; + } tx = adis->buffer + burst_length; tx[0] = ADIS_READ_REG(adis->burst->reg_cmd); -- 2.20.1