From patchwork Mon Mar 9 17:22:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1251671 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48blRB5H4Qz9sPR for ; Tue, 10 Mar 2020 04:22:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727365AbgCIRWn (ORCPT ); Mon, 9 Mar 2020 13:22:43 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:34113 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727101AbgCIRWn (ORCPT ); Mon, 9 Mar 2020 13:22:43 -0400 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jBM6y-0000kW-MR for netdev@vger.kernel.org; Mon, 09 Mar 2020 17:22:40 +0000 Received: by mail-wr1-f70.google.com with SMTP id z16so5489208wrm.15 for ; Mon, 09 Mar 2020 10:22:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding; bh=RpSrK82GO+XpUM86Hc84ckqih+54BcF5pmkDsAsQd94=; b=rrGAJn+tf/VGQ5oCNQKTrBofRXkEH1/mh+mOGAJphrypzRhLcVmmDz6wuyh6Y2YSUi Zd5F7zi+41Wkt9ncAflwfJb5RfvHMISXFH2i7Ojjc5E6fpLJ9C9Q/Ob2C+IjytyV087/ Gqd+6oHdRxC2AZul/BxDuNT/t/1EUSYU8JlwQkynyfnajOWqYKa64yBYmZFSDXfgx6Ss fx2ATxwFcL8Mom3ERJOWa3boBWR/0wFmZtck0+2f5ADs2WQQgm06fAU9xaCmV4s1Gqyv aEoRZ7R/Puafdg1O9FvJp+EOv/qg8g9gKi+tbSjepwwZFrU9VN4Zm2eJa1obihHjoFNB NI1A== X-Gm-Message-State: ANhLgQ30JvMOmZJfJCsBOflU15V1njQPucPVshsYbjivPtRP5U+ynXnO ZnTgT+g/OfDJYTUz9puUrhqG++1g5pclQyyFG59H7u1oiAux2tC8r5KjKQm1Mlht3xHl8c+DkEL BPS/dABozQ2um2zdKEqs9Ee+e1kDOGuevoQ== X-Received: by 2002:a05:6000:120e:: with SMTP id e14mr1259386wrx.182.1583774560365; Mon, 09 Mar 2020 10:22:40 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv8sQL3WWVTi+4BELgM2W/7njbFPyjSiHW1ToTXk7sW2lk01O+Ey4fXnfe0i9+DFCXBS6PtsA== X-Received: by 2002:a05:6000:120e:: with SMTP id e14mr1259366wrx.182.1583774560108; Mon, 09 Mar 2020 10:22:40 -0700 (PDT) Received: from localhost (host96-127-dynamic.32-79-r.retail.telecomitalia.it. [79.32.127.96]) by smtp.gmail.com with ESMTPSA id y189sm286063wmb.26.2020.03.09.10.22.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 10:22:39 -0700 (PDT) Date: Mon, 9 Mar 2020 18:22:38 +0100 From: Andrea Righi To: Richard Cochran , Vladis Dronov Cc: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ptp: free ptp clock properly Message-ID: <20200309172238.GJ267906@xps-13> MIME-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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"). BugLink: https://bugs.launchpad.net/bugs/1864754 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 --- 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 ac1f2bf9e888..468286ef61ad 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;