From patchwork Sun Aug 19 12:35:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10569717 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 79EC2112E for ; Sun, 19 Aug 2018 12:33:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61F7329342 for ; Sun, 19 Aug 2018 12:33:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53F64293F1; Sun, 19 Aug 2018 12:33:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9DCC29342 for ; Sun, 19 Aug 2018 12:33:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726388AbeHSPoi (ORCPT ); Sun, 19 Aug 2018 11:44:38 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40192 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725885AbeHSPoi (ORCPT ); Sun, 19 Aug 2018 11:44:38 -0400 Received: by mail-wr1-f66.google.com with SMTP id n2-v6so245422wrw.7 for ; Sun, 19 Aug 2018 05:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Tu9xgQARgkonUqHBus2IiVCOhCwdC+bhhybEtNGU73g=; b=tbm2WSJ7hXzby8qguoyI8QGv9ZUPXjxF86CcOLBLkSd8w2oxrBO8lPGdi6D670LqIQ bB/Lu/Sp+BxMuiIqv4i+47+Ik+Ulpf+La2BJkvqDNL+clLCBYE1H5It9bkFnf8a43y8z EGIljn6Ak2gDk8mEyLG2DA6tmH2xy7uc4LsEd1jsXDO/TnIvNaDHX4bfFNIN/MOPIa9d FtXYG1MvRQpoQEvEG9CjXS00B8t2O2VVAwWO2OXxMzFO3wHrxtXczpZ4tWtmMnuz9EQu MUn2iDni5/q7ZXDA9inqJF900gSUntg42AqrURbG+Glqgq6V1QziaC5wzddNWW6bN16P JaFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Tu9xgQARgkonUqHBus2IiVCOhCwdC+bhhybEtNGU73g=; b=sD06OjZ0tXIN2CVWBsIrFpUQvVlxOKjPZyJp9nvMDExG+vsLFH2Qbwridb+V16KZA2 3gY5sZXZvWMc0vMasN1s569+wMr7HJhZkbUVuzXXwwlvZYrThG1a+LgbIPDhudzln41o scmi4tm1rOHoETnq2ozbTTxvZbtOOy+Xcntax4fl6gXyuhM8EJjuZDMEI4YKRXl8ojE4 Qegp1BPEtzsK7gDeGDbgoxr7sSevIqlUxE32S4xRK36Uj1w9fQ0f/igp9RLCa1QTstPi T4QlueNOLlTXYaLXAfhChziIhrKKarDe5kkOAz6C4pmvy5Z1IqPHmIH86gIr6WknE2MZ RhUg== X-Gm-Message-State: AOUpUlHpr1XrBsKxfCjshaDeMYQc/me594sa7lS0a1eFyERgLfAXFiof 5xUFF2tdwe5gz581vsHvba8mgihu X-Google-Smtp-Source: AA+uWPze2OdsqkPh9b6w0yTx+LoudOrbtMhF4lKegmGdZpFJSsR9yk8xNvnVwxq2tNOtEcYegpLRyw== X-Received: by 2002:a5d:6b01:: with SMTP id v1-v6mr26836474wrw.208.1534681997581; Sun, 19 Aug 2018 05:33:17 -0700 (PDT) Received: from localhost.localdomain (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id e141-v6sm15353187wmd.32.2018.08.19.05.33.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Aug 2018 05:33:17 -0700 (PDT) From: Amir Goldstein To: Jan Kara Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH] fsnotify: fix false positive warning on inode delete Date: Sun, 19 Aug 2018 15:35:06 +0300 Message-Id: <1534682106-26538-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reported-and-tested-by: syzbot+c34692a51b9a6ca93540@syzkaller.appspotmail.com Fixes: 3ac70bfcde81 ("fsnotify: add helper to get mask from connector") Signed-off-by: Amir Goldstein --- Jan, syzbot reported (in private email) that the reproducer did not trigger the warning, so added tested-by. Thanks, Amir. fs/notify/mark.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/notify/mark.c b/fs/notify/mark.c index 05506d60131c..d559a8ffe7ed 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -236,6 +236,13 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) if (hlist_empty(&conn->list)) { inode = fsnotify_detach_connector_from_object(conn); free_conn = true; + } else if (conn->type == FSNOTIFY_OBJ_TYPE_DETACHED) { + /* + * fsnotify_destroy_marks() detaches conn from object before + * put on last mark of object list and other marks on the list + * may still have elevated refcounts. We don't need to recalc + * mask nor to free_conn in that case. + */ } else { __fsnotify_recalc_mask(conn); }