From patchwork Fri Mar 27 10:07:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1262683 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 48pcwd5c4bz9sSQ; Fri, 27 Mar 2020 21:07:27 +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 1jHltY-0005Ec-6x; Fri, 27 Mar 2020 10:07:20 +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 1jHltV-0005EC-V9 for kernel-team@lists.ubuntu.com; Fri, 27 Mar 2020 10:07:17 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jHltV-0003Im-Nb for kernel-team@lists.ubuntu.com; Fri, 27 Mar 2020 10:07:17 +0000 Received: by mail-wr1-f71.google.com with SMTP id o18so4321171wrx.9 for ; Fri, 27 Mar 2020 03:07:17 -0700 (PDT) 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=GVaVm5cNeHtZLt+ENqG3wsuyjNaBz9MHrezeGTb6V/k=; b=KLXBxz+CnMOaKW1UbutZhkLHn2o2NClL4Vx2y5IkrKzcHKAIqHHIv1c3EPRyfVnB0l gsvbAjimJBAmZoNgJZzmSDjWPIpt0qHxBo31oNOga+5QjDsY6ns2b7yJ5Cfj0j36+gzC 8KCIQURWdhivpyCz0NObGOXGBYG6EznBqlm5bxxIZBGULRITDk+51D8PPHZcmiFLQsN/ 77/MtfLYGpCb+Q5SndwXQAFwBE7Rp2S0HSjXVL4cyqU2fAXWUjjn1QOt8g5Qh4M2Yy4h uJXmAJaPyCiyGiIxGBoAM8YM9HEEzQ4SXPPGUTqThOESfPRGVRGA0Lyk9+hq7yYOJblX UGYg== X-Gm-Message-State: ANhLgQ1PQz/wCRFtKWiF/dFAZPYC99GVfbA05x5KWkvGW8nMlsSMstTX sP3kjBxzUcXxRMOZ0VuanXw4e0ewkC51NetiHYQ5e25INLoWDYI4gpgC8ftMlttKgK68am+8j82 MEIyjgT1lnJP2UyQcpWCnsYNbk8KDrPgYN9BP9PXiKg== X-Received: by 2002:a7b:cd89:: with SMTP id y9mr4712432wmj.142.1585303637128; Fri, 27 Mar 2020 03:07:17 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt9zSvMKvlNvg2aGx5/NcXN4i/J0djvyCmQFMJoYWp3CLbIeWbqPuBBHqi5sepLH/hhlHjdUA== X-Received: by 2002:a7b:cd89:: with SMTP id y9mr4712409wmj.142.1585303636796; Fri, 27 Mar 2020 03:07:16 -0700 (PDT) Received: from xps-13.homenet.telecomitalia.it (host87-23-dynamic.53-79-r.retail.telecomitalia.it. [79.53.23.87]) by smtp.gmail.com with ESMTPSA id t81sm7448119wmb.15.2020.03.27.03.07.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 03:07:16 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/1][F] UBUNTU: SAUCE: ptp: free ptp clock properly Date: Fri, 27 Mar 2020 11:07:06 +0100 Message-Id: <20200327100706.1356731-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327100706.1356731-1-andrea.righi@canonical.com> References: <20200327100706.1356731-1-andrea.righi@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" BugLink: https://bugs.launchpad.net/bugs/1864754 There is a bug in ptp_clock_unregister() where pps_unregister_source() can free up resources needed by posix_clock_unregister() to properly destroy a related sysfs device. Fix this by calling pps_unregister_source() in ptp_clock_release(). See also: commit 75718584cb3c ("ptp: free ptp device pin descriptors properly"). Fixes: a33121e5487b ("ptp: fix the race between the release of ptp_clock and cdev") Tested-by: Piotr Morgwai Kotarbiński Signed-off-by: Andrea Righi Acked-by: Colin Ian King --- v2: move pps_unregister_source() to ptp_clock_release(), instead of posix_clock_unregister(), that would just introduce a resource leak drivers/ptp/ptp_clock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c index b84f16bbd6f2..d45c76566195 100644 --- a/drivers/ptp/ptp_clock.c +++ b/drivers/ptp/ptp_clock.c @@ -170,6 +170,9 @@ static void ptp_clock_release(struct device *dev) { struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev); + /* Release the clock's resources. */ + if (ptp->pps_source) + pps_unregister_source(ptp->pps_source); ptp_cleanup_pin_groups(ptp); mutex_destroy(&ptp->tsevq_mux); mutex_destroy(&ptp->pincfg_mux); @@ -298,11 +301,6 @@ int ptp_clock_unregister(struct ptp_clock *ptp) kthread_cancel_delayed_work_sync(&ptp->aux_work); kthread_destroy_worker(ptp->kworker); } - - /* Release the clock's resources. */ - if (ptp->pps_source) - pps_unregister_source(ptp->pps_source); - posix_clock_unregister(&ptp->clock); return 0;