Skip to contentSkip to conversation

inotify: fix watch count leak when fsnotify_add_inode_mark_locked() fails

PATCH In review Chia-Ming Chang 3 participants 3 messages Feb 24 – Feb 26

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 inotify: fix watch count leak when fsnotify_add_inode_mark_locked() fails

When fsnotify_add_inode_mark_locked() fails in inotify_new_watch(), the error path calls inotify_remove_from_idr() but does not call dec_inotify_watches() to undo the preceding inc_inotify_watches(). This leaks a watch count, and repeated failures can exhaust the max_user_watches limit with -ENOSPC even when no watches are active.

Prior to commit 1cce1eea0aff ("inotify: Convert to using per-namespace limits"), the watch count was incremented after fsnotify_add_mark_locked() succeeded, so this path was not affected. The conversion moved inc_inotify_watches() before the mark insertion without adding the corresponding rollback.

Add the missing dec_inotify_watches() call in the error path.

Fixes 1cce1eea0aff ("inotify: Convert to using per-namespace limits")
---
 fs/notify/inotify/inotify_user.c | 1 +
 1 file changed, 1 insertion(+)
fs/notify/inotify/inotify_user.c +1 -0
index b372fb2c56bd..0d813c52ff9c 100644
@@ -621,6 +621,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
 	if (ret) {
 		/* we failed to get on the inode, get off the idr */
 		inotify_remove_from_idr(group, tmp_i_mark);
+		dec_inotify_watches(group->inotify_data.ucounts);
 		goto out_err;
 	}
 
Signature · 4 lines
2.34.1


Disclaimer: The contents of this e-mail message and any attachments are confidential and are intended solely for addressee. The information may also be legally privileged. This transmission is sent in trust, for the sole purpose of delivery to the intended recipient. If you have received this transmission in error, any use, reproduction or dissemination of this transmission is strictly prohibited. If you are not the intended recipient, please immediately notify the sender by reply e-mail or phone and delete this message and its attachments, if any.
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Chia-Ming Chang

When fsnotify_add_inode_mark_locked() fails in inotify_new_watch(), the error path calls inotify_remove_from_idr() but does not call dec_inotify_watches() to undo the preceding inc_inotify_watches(). This leaks a watch count, and repeated failures can exhaust the max_user_watches limit with -ENOSPC even when no watches are active.

Prior to commit 1cce1eea0aff ("inotify: Convert to using per-namespace limits"), the watch count was incremented after fsnotify_add_mark_locked() succeeded, so this path was not affected. The conversion moved inc_inotify_watches() before the mark insertion without adding the corresponding rollback.

Quoted 6 lines

Add the missing dec_inotify_watches() call in the error path.

Fixes 1cce1eea0aff ("inotify: Convert to using per-namespace limits")
Quoted 16 lines
---
  fs/notify/inotify/inotify_user.c | 1 +
  1 file changed, 1 insertion(+)
fs/notify/inotify/inotify_user.c +1 -0
index b372fb2c56bd..0d813c52ff9c 100644
@@ -621,6 +621,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
  	if (ret) {
  		/* we failed to get on the inode, get off the idr */
  		inotify_remove_from_idr(group, tmp_i_mark);
+		dec_inotify_watches(group->inotify_data.ucounts);
  		goto out_err;
  	}
 
maintainer
#2 lore raw
In reply to Chia-Ming Chang
Quoted 12 lines · Chia-Ming Chang

When fsnotify_add_inode_mark_locked() fails in inotify_new_watch(), the error path calls inotify_remove_from_idr() but does not call dec_inotify_watches() to undo the preceding inc_inotify_watches(). This leaks a watch count, and repeated failures can exhaust the max_user_watches limit with -ENOSPC even when no watches are active.

Prior to commit 1cce1eea0aff ("inotify: Convert to using per-namespace limits"), the watch count was incremented after fsnotify_add_mark_locked() succeeded, so this path was not affected. The conversion moved inc_inotify_watches() before the mark insertion without adding the corresponding rollback.

Quoted 6 lines

Add the missing dec_inotify_watches() call in the error path.

Fixes 1cce1eea0aff ("inotify: Convert to using per-namespace limits")

Thanks! I've added the patch to my tree.

Honza

Quoted 21 lines
---
 fs/notify/inotify/inotify_user.c | 1 +
 1 file changed, 1 insertion(+)
fs/notify/inotify/inotify_user.c +1 -0
index b372fb2c56bd..0d813c52ff9c 100644
@@ -621,6 +621,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
 	if (ret) {
 		/* we failed to get on the inode, get off the idr */
 		inotify_remove_from_idr(group, tmp_i_mark);
+		dec_inotify_watches(group->inotify_data.ucounts);
 		goto out_err;
 	}
 
Signature · 4 lines
2.34.1


Disclaimer: The contents of this e-mail message and any attachments are confidential and are intended solely for addressee. The information may also be legally privileged. This transmission is sent in trust, for the sole purpose of delivery to the intended recipient. If you have received this transmission in error, any use, reproduction or dissemination of this transmission is strictly prohibited. If you are not the intended recipient, please immediately notify the sender by reply e-mail or phone and delete this message and its attachments, if any.
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR