From patchwork Thu Dec 19 18:34:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182174 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp866170iln; Thu, 19 Dec 2019 10:50:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwaVKc5hy6AyPWoaxtIT3Bkp7aeKROKiivYyuAayOyWKpq2NaleNaO0Em5mCCpEEFGf+NiV X-Received: by 2002:a9d:27a2:: with SMTP id c31mr10880289otb.151.1576781453806; Thu, 19 Dec 2019 10:50:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781453; cv=none; d=google.com; s=arc-20160816; b=gNkjw6FVP6SMnK/Sz16A4d8BetFSh64q8Y+Lk3TRWEuDRrGjzFzQI7Smtxh+tR0m0k dEHtHDVVNxJyl+O5XNyrd0MABP0KKnO6SdDqKu1LXtqfTV/wTNLBo9hR2iTFjUBQjsVA LlgUy1V/gMuitI2gjiTy5qy+f+qFNyEzJr/J7nCuxfvwaaf1RNlWnnRbMAVwaE/vs1e6 dOYyVtJdXMbea9hbjL45iztgovoRrLHa8qIUZ8JYUOZTk7t9mKwRvq3sQi1Hx/Yy999y WGz4zyRLrgKCiz0SeqUmW2QmdfmTbld9NJb+Q9/KPyFX5aFo5SqruSPkA0SYtJIrmOBP s8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PJJ6duuYTJb3gCJ+lRHXC3H3uFJAaWUCDIg91pvIwzM=; b=Iw5oLYZRSqKR0tXaX4FlG3Smw9HwdDrLB2ZSJYnJlGk/ySx7b/g77tyok1aEGIiUWp YB0LOV0BhqugKmRfcT/aego/+wQ0jpwNeCLBH+Lw1pg65Bnr46/18Et0XGTrwlbyAFxn SE/JKR4PMp2FKziobVwL6N2Jqec16anvL1F3ry42Bxj9/IuU7qY3E5dZuNUJprJChIK2 LHejUgLos1TRUUBr4Zx7ey2JEWI1OwU3DecAghFRYV6i2zRU339QqfjMrQutI6dgSnbT JNbHldQvIpICmbds1krO5j33/yWCp+VifEoumO5olR2yCmfIvhHeTkox5sBh5MZ4DQyx /PAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xe1LJ0UG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e18si3609134otj.99.2019.12.19.10.50.53; Thu, 19 Dec 2019 10:50:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xe1LJ0UG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730057AbfLSSuv (ORCPT + 27 others); Thu, 19 Dec 2019 13:50:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:44712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729759AbfLSSup (ORCPT ); Thu, 19 Dec 2019 13:50:45 -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 7F6512467F; Thu, 19 Dec 2019 18:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781445; bh=kYqNubHyQokemBhQ/7OuH7fwMiQPADTBVzdD2Cob9+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xe1LJ0UGNOFb08MXi88YCXW4xHExMsdU6ypDlaVQ1ps/HzfKyvnOgH68mvqUgV6Ip uUcpH5EcdPW00vDuXyaEGbUULkaU15wpwFfy9Lm7NuETRpn5aLU9X2DtLvwvvsXPdD ijL0pASKioLIYIxxhT9mSsjw9OdIz7+dy0NQPHws= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Lew , Srinivas Kandagatla , Bjorn Andersson Subject: [PATCH 4.14 25/36] rpmsg: glink: Free pending deferred work on remove Date: Thu, 19 Dec 2019 19:34:42 +0100 Message-Id: <20191219182917.324506203@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219182848.708141124@linuxfoundation.org> References: <20191219182848.708141124@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson commit 278bcb7300f61785dba63840bd2a8cf79f14554c upstream. By just cancelling the deferred rx worker during GLINK instance teardown any pending deferred commands are leaked, so free them. Fixes: b4f8e52b89f6 ("rpmsg: Introduce Qualcomm RPM glink driver") Cc: stable@vger.kernel.org Acked-by: Chris Lew Tested-by: Srinivas Kandagatla Signed-off-by: Bjorn Andersson Signed-off-by: Greg Kroah-Hartman --- drivers/rpmsg/qcom_glink_native.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1539,6 +1539,18 @@ static void qcom_glink_work(struct work_ } } +static void qcom_glink_cancel_rx_work(struct qcom_glink *glink) +{ + struct glink_defer_cmd *dcmd; + struct glink_defer_cmd *tmp; + + /* cancel any pending deferred rx_work */ + cancel_work_sync(&glink->rx_work); + + list_for_each_entry_safe(dcmd, tmp, &glink->rx_queue, node) + kfree(dcmd); +} + struct qcom_glink *qcom_glink_native_probe(struct device *dev, unsigned long features, struct qcom_glink_pipe *rx, @@ -1611,7 +1623,7 @@ void qcom_glink_native_remove(struct qco int ret; disable_irq(glink->irq); - cancel_work_sync(&glink->rx_work); + qcom_glink_cancel_rx_work(glink); ret = device_for_each_child(glink->dev, NULL, qcom_glink_remove_device); if (ret)