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=-8.6 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_SANE_2 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 2341FC4360D for ; Sat, 21 Sep 2019 18:11:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5CB7218AE for ; Sat, 21 Sep 2019 18:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569089500; bh=+j2NftTgVB/uEJoBJMJYrqT3F+1ZbejcQjaaV0Bb4EM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=eH4c45J9K5keTqyjKYC493BXUyBzVXpBuHZgk7JW/8hszP8ZI4t0qLQ0LAbgXb1TQ tYBS2WU20Qoy7oAzfDUgydVrvN3Kdq5MB+b7quWugHol09IW77stZhnocJ2DLAYuOB 54DE2l4L3cpqOf0DMLX0sr8eCbNvGytvAjhevhbw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727824AbfIUSLj (ORCPT ); Sat, 21 Sep 2019 14:11:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:32892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727784AbfIUSLj (ORCPT ); Sat, 21 Sep 2019 14:11:39 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (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 489FE2080F; Sat, 21 Sep 2019 18:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569089498; bh=+j2NftTgVB/uEJoBJMJYrqT3F+1ZbejcQjaaV0Bb4EM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=B6i+hZbYCOt8hATSgKEzQiiJJi2hhGFxf5t5XRnZPn0U4b7R7ni4qtoFnXK6Ybexd g3buqih/uEPQZP6b9rQ9jKzWQhuM2Lki35HBBhNL6ve222tlO7DEcY8xtqfSyLRBhk 0iQk9gJJMUdBHyNjKBvvmGMMZI7X52+gLgt43OH0= Date: Sat, 21 Sep 2019 19:11:33 +0100 From: Jonathan Cameron To: "Ardelean, Alexandru" Cc: "navid.emamdoost@gmail.com" , "Popa, Stefan Serban" , "emamd001@umn.edu" , "linux-iio@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "knaack.h@gmx.de" , "Hennerich, Michael" , "lars@metafoo.de" , "smccaman@umn.edu" , "kjlu@umn.edu" , "pmeerw@pmeerw.net" Subject: Re: [PATCH v2] iio: imu: adis16400: release allocated memory on failure Message-ID: <20190921191133.62f12b65@archlinux> In-Reply-To: References: <84e2832b52cc88665ff071942c1545b83eeb5602.camel@analog.com> <20190919155003.2207-1-navid.emamdoost@gmail.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Fri, 20 Sep 2019 06:46:37 +0000 "Ardelean, Alexandru" wrote: > On Thu, 2019-09-19 at 10:50 -0500, Navid Emamdoost wrote: > > In adis_update_scan_mode, if allocation for adis->buffer fails, > > previously allocated adis->xfer needs to be released. > > > > v2: added adis->xfer = NULL to avoid any potential double free. Version changes go below the --- so they don't get recorded in the git tree log when it's applied. > > Reviewed-by: Alexandru Ardelean Applied to the fixes-togreg branch of iio.git. Thanks, Jonathan > > > Signed-off-by: Navid Emamdoost > > --- > > 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 9ac8356d9a95..f446ff497809 100644 > > --- a/drivers/iio/imu/adis_buffer.c > > +++ b/drivers/iio/imu/adis_buffer.c > > @@ -78,8 +78,11 @@ int adis_update_scan_mode(struct iio_dev *indio_dev, > > return -ENOMEM; > > > > adis->buffer = kcalloc(indio_dev->scan_bytes, 2, GFP_KERNEL); > > - if (!adis->buffer) > > + if (!adis->buffer) { > > + kfree(adis->xfer); > > + adis->xfer = NULL; > > return -ENOMEM; > > + } > > > > rx = adis->buffer; > > tx = rx + scan_count;