From patchwork Fri Mar 12 14:35:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1452120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DxpJp37wRz9sW1; Sat, 13 Mar 2021 01:35:54 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lKitL-0008PD-93; Fri, 12 Mar 2021 14:35:51 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lKitI-0008Op-Iz for kernel-team@lists.ubuntu.com; Fri, 12 Mar 2021 14:35:48 +0000 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lKitI-00056S-Ba for kernel-team@lists.ubuntu.com; Fri, 12 Mar 2021 14:35:48 +0000 Received: by mail-wr1-f72.google.com with SMTP id m23so6224207wrh.7 for ; Fri, 12 Mar 2021 06:35:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KWuPxK4ri6f3EB2hme/OvV4+ae4eQAYxh60+2KQERr0=; b=RZH6y8qz/4Ua7hnwP8+AT1xIbkyT9So33Xb6vced4OkUA5UoY+Qwji5N7eJbKIeOqk wCPXDhw7OyyD8EqtVaWj3KeOIsBl18mbPH6pFlBZNuat/h5YNkcAxCUWBV7UKwqTeHK5 A3QeTS/MLuMRAnyr93q5rcepdBFOy0xlEYwf0wfODufKEyVprMMPEErOO/QdpreruxoG C/zK18W/h/vXdiFk0c3klXRaiMI9SdZJ0ippDuRbE2nJ63a2JLwH661jFNOe92eqioj4 X5KGZz1ryZWe8F3tT8BqzMtgTza1REao/MajTlx6rVrl907oVfnOSgStVG1oCx1nmGI7 BPOA== X-Gm-Message-State: AOAM533phcrqLT6lpH4dsoPsjf3w2nPorEKczh7ORQW6QqSDR8kMw+Nx ftHIX/wyBDN9ZtNU2B0PeC/YgF5WFqDMJN4wFr3BYsx+XRtKiwUXnROg9+1yuLzIKu/bebaw//n MKtImBdLAX/B1RkPd0eoc+ooDoVYQ7uosYZR1KLWjog== X-Received: by 2002:adf:bc01:: with SMTP id s1mr14481760wrg.240.1615559747839; Fri, 12 Mar 2021 06:35:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWeiQvnvfASf4RXBZNU8iPBRV5H/EOnzoV2Zs04hhuFsj7uN+7cY9Bmd3ERUVRq+TaxpyErA== X-Received: by 2002:adf:bc01:: with SMTP id s1mr14481751wrg.240.1615559747731; Fri, 12 Mar 2021 06:35:47 -0800 (PST) Received: from localhost.localdomain (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.gmail.com with ESMTPSA id c131sm2382231wma.37.2021.03.12.06.35.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 06:35:47 -0800 (PST) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [SRU][X][PATCH 1/1] iio: imu: adis16400: fix memory leak Date: Fri, 12 Mar 2021 15:35:37 +0100 Message-Id: <20210312143537.63316-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210312143537.63316-1-krzysztof.kozlowski@canonical.com> References: <20210312143537.63316-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Navid Emamdoost CVE-2019-19061 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 (cherry picked from commit 9c0530e898f384c5d279bfcebd8bb17af1105873) [krzk: backport applied to adis16400_buffer.c instead of adis_buffer.c] Signed-off-by: Krzysztof Kozlowski --- drivers/iio/imu/adis16400_buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c index 90c24a23c679..c0eb9dfd1c45 100644 --- a/drivers/iio/imu/adis16400_buffer.c +++ b/drivers/iio/imu/adis16400_buffer.c @@ -37,8 +37,11 @@ int adis16400_update_scan_mode(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(ADIS16400_GLOB_CMD);