inotify: fix one-shot support
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi Robert,
hi John,
just saw this commit.
Quoted 9 lines · you
tree
5b5af4e03e627b66a9f37d25dd370a145ec72438
parent8e08b756869eeb08ace17ad64c2a8cb97b18e856
author Robert Love <[email protected]> Wed, 08 Feb 2006 04:58:45 -0800 committer Linus Torvalds <[email protected]> Wed, 08 Feb 2006 08:12:33 -0800[PATCH] inotify: fix one-shot support
Fix one-shot support in inotify. We currently drop the
IN_ONESHOTflag during watch addition. Fix is to not do that.
Yes, but now you can add a watch without any event attached. This would revert the original sense of the test.
Quoted 13 lines
Signed-off-by Robert Love <[email protected]>Cc John McCutchan <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>fs/inotify.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)fs/inotify.c +0
-0
fs/inotify.c asmlinkage long sys_inotify_add_watch(in · line 973
Quoted 8 lines
fs/inotify.c +1
-1@@ -967,7 +967,7 @@ asmlinkage long sys_inotify_add_watch(in mask_add =1 ;/* don't let user-space set invalid bits: we don't want flags set */ - mask &=IN_ALL_EVENTS ; + mask &=IN_ALL_EVENTS |IN_ONESHOT ;if (unlikely (!mask)) { ret = -EINVAL ; goto out;
See, now you can just pass IN_ONESHOT behavior flag without any events to shoot at, which you couldn't do before. But this makes only sense, if we would like to set a multi-shot mask to one-shot now.
Does this transition (multi shot to single shot)makes sense at all? Is it race-free to allow this?.
So my suggested fix instead of yours would be:
/* don't let user-space set invalid bits: we don't want flags set */ mask &= IN_ALL_EVENTS | IN_ONESHOT;
if (unlikely((mask & IN_ALL_EVENTS) == 0 && !mask_add)) {
ret = -EINVAL;
goto out;
}Would you like a patch on top of the one submitted by you?
Regards
Ingo Oeser
Quoted 3 lines · Ingo Oeser
See, now you can just pass
IN_ONESHOTbehavior flag without any events to shoot at, which you couldn't do before. But this makes only sense, if we would like to set a multi-shot mask to one-shot now.
Ack!
Quoted 2 lines
Does this transition (multi shot to single shot)makes sense at all? Is it race-free to allow this?.
It should be okay. This was my intention in the patch.
Quoted 10 lines
So my suggested fix instead of yours would be:
/* don't let user-space set invalid bits: we don't want flags set */ mask &=
IN_ALL_EVENTS|IN_ONESHOT;if (unlikely((mask & IN_ALL_EVENTS) == 0 && !mask_add)) { ret = -EINVAL; goto out; }Would you like a patch on top of the one submitted by you?
Yes, because my patch was already merged by Linus.
Robert Love
Hi Robert,
hi John,
Quoted 6 lines · Robert Love
Quoted 3 lines · Ingo Oeser
See, now you can just pass
IN_ONESHOTbehavior flag without any events to shoot at, which you couldn't do before. But this makes only sense, if we would like to set a multi-shot mask to one-shot now.Ack!
Ok, here comes the patch (against Linus' HEAD).
It turned out, that we needed to change some more places to avoid having zero events to watch for. If you are ok with it, I'll send it straight to Linus with your Ack included and in proper patch format.
Regards
Ingo Oeser
fs/inotify.c +16 -2
@@ -935,6 +935,7 @@ asmlinkage long sys_inotify_add_watch(instruct file *filp;int ret, fput_needed;int mask_add =0 ; +int no_events =0 ;unsigned flags =0 ; filp =fget_light (fd, &fput_needed);
@@ -966,9 +967,13 @@ asmlinkage long sys_inotify_add_watch(inif (mask &IN_MASK_ADD ) mask_add =1 ; -/* don't let user-space set invalid bits: we don't want flags set */ +/* Do we change and events or only multishot/singleshot? */ +if (!(mask &IN_ALL_EVENTS )) + no_events =1 ; + +/* Don't let user-space set invalid bits: we don't want flags set. */ mask &=IN_ALL_EVENTS |IN_ONESHOT ; -if (unlikely (!mask)) { +if (unlikely (no_events && !mask_add)) { ret = -EINVAL ; goto out; }
@@ -987,6 +992,15 @@ asmlinkage long sys_inotify_add_watch(in goto out; } +/* +* Want to change only multishot/singleshot, +* but has no existing watch? -> Illegal -ioe +*/ +if (unlikely (no_events)) { + ret = -EINVAL ; + goto out; + } + watch =create_watch (dev, mask, inode);if (unlikely (IS_ERR (watch))) { ret =PTR_ERR (watch);