Return-Path: Received: from mx2.suse.de ([195.135.220.15]:34018 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752411AbdJaJer (ORCPT ); Tue, 31 Oct 2017 05:34:47 -0400 From: Jan Kara To: Cc: amir73il@gmail.com, Jan Kara Subject: [PATCH 2/2] fsnotify: Protect bail out path of fsnotify_add_mark_locked() properly Date: Tue, 31 Oct 2017 10:33:42 +0100 Message-Id: <20171031093342.25216-3-jack@suse.cz> In-Reply-To: <20171031093342.25216-1-jack@suse.cz> References: <20171031093342.25216-1-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: When fsnotify_add_mark_locked() fails it cleans up the mark it was adding. Since the mark is already visible in group's list, we should protect update of mark->flags with mark->lock. I'm not aware of any real issues this could cause (since we also hold group->mark_mutex) but better be safe and obey locking rules properly. Signed-off-by: Jan Kara --- fs/notify/mark.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/notify/mark.c b/fs/notify/mark.c index 9991f8826734..47a827975b58 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -599,9 +599,11 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark, struct inode *inode, return ret; err: + spin_lock(&mark->lock); mark->flags &= ~(FSNOTIFY_MARK_FLAG_ALIVE | FSNOTIFY_MARK_FLAG_ATTACHED); list_del_init(&mark->g_list); + spin_unlock(&mark->lock); atomic_dec(&group->num_marks); fsnotify_put_mark(mark); -- 2.12.3