fsnotify: add generic perm check for unlink/rmdir
Subsystems (7)
PATCH 1/1 fsnotify: add generic perm check for unlink/rmdir
From: duguowei <[email protected]>
For now, there have been open/access/open_exec perms for file operation, so we add new perms check with unlink/rmdir syscall. if one app deletes any file/dir within pubic area, fsnotify can sends fsnotify_event to listener to deny that, even if the app have right dac/mac permissions.
--- fs/notify/fsnotify.c | 2 +- include/linux/fs.h | 2 ++ include/linux/fsnotify.h | 16 ++++++++++++++++ include/linux/fsnotify_backend.h | 6 +++++- security/security.c | 12 ++++++++++-- security/selinux/hooks.c | 4 ++++ 6 files changed, 38 insertions(+), 4 deletions(-)
fs/notify/fsnotify.c +1 -1
@@ -581,7 +581,7 @@ static __init int fsnotify_init(void) {int ret; -BUILD_BUG_ON (HWEIGHT32 (ALL_FSNOTIFY_BITS ) !=25 ); +BUILD_BUG_ON (HWEIGHT32 (ALL_FSNOTIFY_BITS ) !=27 ); ret =init_srcu_struct (&fsnotify_mark_srcu);if (ret)
include/linux/fs.h +2 -0
@@ -100,6 +100,8 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,#define MAY_CHDIR 0x00000040/* called from RCU mode, don't block */ #define MAY_NOT_BLOCK 0x00000080 +#define MAY_UNLINK 0x00000100 +#define MAY_RMDIR 0x00000200/* * flags in file.f_mode. Note that FMODE_READ and FMODE_WRITE must correspond
include/linux/fsnotify.h +16 -0
@@ -80,6 +80,22 @@ static inline int fsnotify_parent(struct dentry *dentry, __u32 mask,return fsnotify (mask, data, data_type,NULL ,NULL , inode,0 ); } +static inline int fsnotify_path_perm (struct path *path,struct dentry *dentry,__u32 mask) +{ +__u32 fsnotify_mask =0 ; + +if (!(mask & (MAY_UNLINK |MAY_RMDIR ))) +return 0 ; + +if (mask &MAY_UNLINK ) + fsnotify_mask |=FS_UNLINK_PERM ; + +if (mask &MAY_RMDIR ) + fsnotify_mask |=FS_RMDIR_PERM ; + +return fsnotify_parent (dentry, fsnotify_mask, path,FSNOTIFY_EVENT_PATH ); +} +/* * Simple wrappers to consolidate calls to fsnotify_parent() when an event * is on a file/dentry.
include/linux/fsnotify_backend.h +5 -1
@@ -54,6 +54,8 @@#define FS_OPEN_PERM 0x00010000/* open event in an permission hook */ #define FS_ACCESS_PERM 0x00020000/* access event in a permissions hook */ #define FS_OPEN_EXEC_PERM 0x00040000/* open/exec event in a permission hook */ +#define FS_UNLINK_PERM 0x00080000/* unlink event in a permission hook */ +#define FS_RMDIR_PERM 0x00100000/* rmdir event in a permission hook */ #define FS_EXCL_UNLINK 0x04000000/* do not send events if object is unlinked */ /*
@@ -79,7 +81,9 @@#define ALL_FSNOTIFY_DIRENT_EVENTS (FS_CREATE | FS_DELETE | FS_MOVE | FS_RENAME)#define ALL_FSNOTIFY_PERM_EVENTS (FS_OPEN_PERM | FS_ACCESS_PERM | \ - FS_OPEN_EXEC_PERM) + FS_OPEN_EXEC_PERM | \ + FS_UNLINK_PERM | \ + FS_RMDIR_PERM)/* * This is a list of all events that may get sent to a parent that is watching
security/security.c +10 -2
@@ -1160,16 +1160,24 @@ EXPORT_SYMBOL(security_path_mkdir);int security_path_rmdir (const struct path *dir,struct dentry *dentry) { +int ret;if (unlikely (IS_PRIVATE (d_backing_inode (dir->dentry))))return 0 ; -return call_int_hook (path_rmdir,0 , dir, dentry); + ret =call_int_hook (path_rmdir,0 , dir, dentry); +if (ret) +return ret; +return fsnotify_path_perm (dir, dentry,MAY_RMDIR ); }int security_path_unlink (const struct path *dir,struct dentry *dentry) { +int ret;if (unlikely (IS_PRIVATE (d_backing_inode (dir->dentry))))return 0 ; -return call_int_hook (path_unlink,0 , dir, dentry); + ret =call_int_hook (path_unlink,0 , dir, dentry); +if (ret) +return ret; +return fsnotify_path_perm (dir, dentry,MAY_UNLINK ); }EXPORT_SYMBOL (security_path_unlink);
security/selinux/hooks.c +4 -0
@@ -1801,8 +1801,12 @@ static int may_create(struct inode *dir, }#define MAY_LINK 0 +#ifndef MAY_UNLINK #define MAY_UNLINK 1 +#endif +#ifndef MAY_RMDIR #define MAY_RMDIR 2 +#endif /* Check whether a task can link, unlink, or rmdir a file/directory. */ static int may_link(struct inode *dir,
Signature · 1 line
2.17.1
Jan Kara
maintainerQuoted 8 lines · Guowei Du
From: duguowei <[email protected]>
For now, there have been open/access/open_exec perms for file operation, so we add new perms check with unlink/rmdir syscall. if one app deletes any file/dir within pubic area, fsnotify can sends
fsnotify_eventto listener to deny that, even if the app have right dac/mac permissions.Signed-off-by duguowei <[email protected]>
Before we go into technical details of implementation can you tell me more details about the usecase? Why do you need to check specifically for unlink / delete?
Also on the design side of things: Do you realize these permission events will not be usable together with other permission events like FAN_OPEN_PERM? Because these require notification group returning file descriptors while your events will return file handles... I guess we should somehow fix that.
Honza
Quoted 137 lines
--- fs/notify/fsnotify.c | 2 +- include/linux/fs.h | 2 ++ include/linux/fsnotify.h | 16 ++++++++++++++++ include/linux/fsnotify_backend.h | 6 +++++- security/security.c | 12 ++++++++++-- security/selinux/hooks.c | 4 ++++ 6 files changed, 38 insertions(+), 4 deletions(-)fs/notify/fsnotify.c +1
-1@@ -581,7 +581,7 @@ static __init int fsnotify_init(void) {int ret; -BUILD_BUG_ON (HWEIGHT32 (ALL_FSNOTIFY_BITS ) !=25 ); +BUILD_BUG_ON (HWEIGHT32 (ALL_FSNOTIFY_BITS ) !=27 ); ret =init_srcu_struct (&fsnotify_mark_srcu);if (ret)include/linux/fs.h +2
-0@@ -100,6 +100,8 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,#define MAY_CHDIR 0x00000040/* called from RCU mode, don't block */ #define MAY_NOT_BLOCK 0x00000080 +#define MAY_UNLINK 0x00000100 +#define MAY_RMDIR 0x00000200/* * flags in file.f_mode. Note that FMODE_READ and FMODE_WRITE must correspond include/linux/fsnotify.h +16
-0@@ -80,6 +80,22 @@ static inline int fsnotify_parent(struct dentry *dentry, __u32 mask,return fsnotify (mask, data, data_type,NULL ,NULL , inode,0 ); } +static inline int fsnotify_path_perm (struct path *path,struct dentry *dentry,__u32 mask) +{ +__u32 fsnotify_mask =0 ; + +if (!(mask & (MAY_UNLINK |MAY_RMDIR ))) +return 0 ; + +if (mask &MAY_UNLINK ) + fsnotify_mask |=FS_UNLINK_PERM ; + +if (mask &MAY_RMDIR ) + fsnotify_mask |=FS_RMDIR_PERM ; + +return fsnotify_parent (dentry, fsnotify_mask, path,FSNOTIFY_EVENT_PATH ); +} +/* * Simple wrappers to consolidate calls to fsnotify_parent() when an event * is on a file/dentry. include/linux/fsnotify_backend.h +5
-1@@ -54,6 +54,8 @@#define FS_OPEN_PERM 0x00010000/* open event in an permission hook */ #define FS_ACCESS_PERM 0x00020000/* access event in a permissions hook */ #define FS_OPEN_EXEC_PERM 0x00040000/* open/exec event in a permission hook */ +#define FS_UNLINK_PERM 0x00080000/* unlink event in a permission hook */ +#define FS_RMDIR_PERM 0x00100000/* rmdir event in a permission hook */ #define FS_EXCL_UNLINK 0x04000000/* do not send events if object is unlinked */ /* @@ -79,7 +81,9 @@#define ALL_FSNOTIFY_DIRENT_EVENTS (FS_CREATE | FS_DELETE | FS_MOVE | FS_RENAME)#define ALL_FSNOTIFY_PERM_EVENTS (FS_OPEN_PERM | FS_ACCESS_PERM | \ - FS_OPEN_EXEC_PERM) + FS_OPEN_EXEC_PERM | \ + FS_UNLINK_PERM | \ + FS_RMDIR_PERM)/* * This is a list of all events that may get sent to a parent that is watching security/security.c +10
-2@@ -1160,16 +1160,24 @@ EXPORT_SYMBOL(security_path_mkdir);int security_path_rmdir (const struct path *dir,struct dentry *dentry) { +int ret;if (unlikely (IS_PRIVATE (d_backing_inode (dir->dentry))))return 0 ; -return call_int_hook (path_rmdir,0 , dir, dentry); + ret =call_int_hook (path_rmdir,0 , dir, dentry); +if (ret) +return ret; +return fsnotify_path_perm (dir, dentry,MAY_RMDIR ); }int security_path_unlink (const struct path *dir,struct dentry *dentry) { +int ret;if (unlikely (IS_PRIVATE (d_backing_inode (dir->dentry))))return 0 ; -return call_int_hook (path_unlink,0 , dir, dentry); + ret =call_int_hook (path_unlink,0 , dir, dentry); +if (ret) +return ret; +return fsnotify_path_perm (dir, dentry,MAY_UNLINK ); }EXPORT_SYMBOL (security_path_unlink);security/selinux/hooks.c +4
-0@@ -1801,8 +1801,12 @@ static int may_create(struct inode *dir, }#define MAY_LINK 0 +#ifndef MAY_UNLINK #define MAY_UNLINK 1 +#endif +#ifndef MAY_RMDIR #define MAY_RMDIR 2 +#endif /* Check whether a task can link, unlink, or rmdir a file/directory. */ static int may_link(struct inode *dir,Signature · 1 line
2.17.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Amir Goldstein
reviewerQuoted 15 lines · Jan Kara
Quoted 8 lines · Guowei Du
From: duguowei <[email protected]>
For now, there have been open/access/open_exec perms for file operation, so we add new perms check with unlink/rmdir syscall. if one app deletes any file/dir within pubic area, fsnotify can sends
fsnotify_eventto listener to deny that, even if the app have right dac/mac permissions.Signed-off-by duguowei <[email protected]>Before we go into technical details of implementation can you tell me more details about the usecase? Why do you need to check specifically for unlink / delete?
Quoted 6 lines
Also on the design side of things: Do you realize these permission events will not be usable together with other permission events like
FAN_OPEN_PERM? Because these require notification group returning file descriptors while your events will return file handles... I guess we should somehow fix that.
IMO, regardless of file descriptions vs. file handles, blocking events have no business with async events in the same group at all.
What is the use case for that?
Sure, we have the legacy permission event, but if we do add new blocking events to UAPI, IMO they should be added to a group that was initialized with a different class to indicate "blocking events only".
And if we do that, we will not need to pollute the event mask namespace for every permission event.
When users request to get FAN_UNLINK/FAN_RMDIR events in a FAN_CLASS_PERMISSION group, internally, that only captures events reported from fsnotify_perm()/fsnotify_path_perm().
FYI, I do intend to try and upload "pre-modify events" [1]. I had no intention to expose those in fanotify and my implementation does not have the granularity of UNLINK/RMDIR, but we do need to think about not duplicating too much code with those overlapping features.
Thanks,
Amir.
[1] https://github.com/amir73il/linux/commits/fsnotify_pre_modify
Jan Kara
maintainerQuoted 30 lines · Amir Goldstein
Quoted 15 lines · Jan Kara
Quoted 8 lines · Guowei Du
From: duguowei <[email protected]>
For now, there have been open/access/open_exec perms for file operation, so we add new perms check with unlink/rmdir syscall. if one app deletes any file/dir within pubic area, fsnotify can sends
fsnotify_eventto listener to deny that, even if the app have right dac/mac permissions.Signed-off-by duguowei <[email protected]>Before we go into technical details of implementation can you tell me more details about the usecase? Why do you need to check specifically for unlink / delete?
Quoted 6 lines
Also on the design side of things: Do you realize these permission events will not be usable together with other permission events like
FAN_OPEN_PERM? Because these require notification group returning file descriptors while your events will return file handles... I guess we should somehow fix that.IMO, regardless of file descriptions vs. file handles, blocking events have no business with async events in the same group at all.
What is the use case for that?
Sure, we have the legacy permission event, but if we do add new blocking events to UAPI, IMO they should be added to a group that was initialized with a different class to indicate "blocking events only".
Quoted 2 lines
And if we do that, we will not need to pollute the event mask namespace for every permission event.
That's an interesting idea. I agree mixing of permission and normal events is not very useful and separating event mask for permission and other events looks like a compelling reason to really forbid that :). It's a pity nobody had this idea when proposing fanotify permission events.
Quoted 9 lines
When users request to get FAN_UNLINK/FAN_RMDIR events in a
FAN_CLASS_PERMISSIONgroup, internally, that only captures events reported from fsnotify_perm()/fsnotify_path_perm().FYI, I do intend to try and upload "pre-modify events" [1]. I had no intention to expose those in fanotify and my implementation does not have the granularity of UNLINK/RMDIR, but we do need to think about not duplicating too much code with those overlapping features.
Definitely.
Honza
Quoted 1 line
[1] https://github.com/amir73il/linux/commits/fsnotify_pre_modify
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
A message that is not in the archive (sent off-list or not yet received): CAC+1Nxv5n0eGtRhfS6pxt8Z-no5scu2kO2pu+_6CpbkeeBqFAw@mail.gmail.com
Jan Kara
maintainerHello!
Quoted 9 lines · guowei du
for the first issue,one usecase is ,for the shared storage with
android device,shared storage is public to all apps which gained whole storage rwx permission,
and computer could also read/write the storage by usb cable
connected.
so ,we need to protect some resources such as photoes or videos or
some secure documents in the shared storage.
in other words,we want to subdivide permissions of that area for
open/read/unlink and so on.
I see but I thought that MTP protocol was there exactly so that the phone can control the access from computer to the shared storage. So it is probably not the case that you'd need this fanotify feature to control MTP client access but you want to say block image removal while the file is being transfered over MTP? Do I get this right?
Quoted 3 lines
for the second issue. every
FANOTIFY_EVENT_TYPE_PATHevent will
'dentry_open' a new file with FMODE_NONOTIFY,then bind to a new unused fd, so could tell me the reason?
Yes, this is just how fanotify was designed. And it was designed in this way because it was created for use by antivirus scanners which wanted to read the file contents and based on that decide whether the file could be accessed or not.
Quoted 2 lines
and next step ,i will go on to fix the related issue such as
fanotify module.
I have realized that you do propagate struct path to fsnotify with your new RMDIR_PERM and UNLINK_PERM events (unlike standard DELETE fsnotify events) so things should work in the same way as say for OPEN_PERM events.
Honza
Quoted 180 lines · Jan Kara
Quoted 179 lines · Guowei Du
Quoted 8 lines
From: duguowei <[email protected]>
For now, there have been open/access/open_exec perms for file operation, so we add new perms check with unlink/rmdir syscall. if one app deletes any file/dir within pubic area, fsnotify can sends
fsnotify_eventto listener to deny that, even if the app have right dac/mac permissions.Signed-off-by duguowei <[email protected]>Before we go into technical details of implementation can you tell me more details about the usecase? Why do you need to check specifically for unlink / delete?
Also on the design side of things: Do you realize these permission events will not be usable together with other permission events like
FAN_OPEN_PERM? Because these require notification group returning file descriptors while your events will return file handles... I guess we should somehow fix that.Honza
include/linux/fs.h typedef int (dio_iodone_t)(struct kiocb *iocb,
Quoted 27 lines
--- fs/notify/fsnotify.c | 2 +- include/linux/fs.h | 2 ++ include/linux/fsnotify.h | 16 ++++++++++++++++ include/linux/fsnotify_backend.h | 6 +++++- security/security.c | 12 ++++++++++-- security/selinux/hooks.c | 4 ++++ 6 files changed, 38 insertions(+), 4 deletions(-)fs/notify/fsnotify.c +1
-1@@ -581,7 +581,7 @@ static __init int fsnotify_init(void) {int ret; -BUILD_BUG_ON (HWEIGHT32 (ALL_FSNOTIFY_BITS ) !=25 ); +BUILD_BUG_ON (HWEIGHT32 (ALL_FSNOTIFY_BITS ) !=27 ); ret =init_srcu_struct (&fsnotify_mark_srcu);if (ret)include/linux/fs.h +0
-0@@ -100,6 +100,8 @@ typedef int (dio_iodone_t)(struct kiocb *iocb,
loff_toffset,include/linux/fs.h typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
Quoted 8 lines
include/linux/fs.h +2
-0#define MAY_CHDIR 0x00000040/* called from RCU mode, don't block */ #define MAY_NOT_BLOCK 0x00000080 +#define MAY_UNLINK 0x00000100 +#define MAY_RMDIR 0x00000200/* * flags in file.f_mode. Note that FMODE_READ and FMODE_WRITE must correspond
include/linux/fsnotify.h static inline int fsnotify_parent(struct dentry
Quoted 5 lines
include/linux/fsnotify.h +0
-0@@ -80,6 +80,22 @@ static inline int fsnotify_parent(struct dentry*dentry,
__u32mask,include/linux/fsnotify.h static inline int fsnotify_parent(struct dentry *dentry, __u32 mask,
Quoted 4 lines
include/linux/fsnotify.h +1
-0return fsnotify (mask, data, data_type,NULL ,NULL , inode,0 ); } +static inline int fsnotify_path_perm(struct path *path, struct dentry*dentry,
__u32mask)include/linux/fsnotify.h static inline int fsnotify_parent(struct dentry *dentry, __u32 mask,
Quoted 13 lines
include/linux/fsnotify.h +13
-0+{ +__u32 fsnotify_mask =0 ; + +if (!(mask & (MAY_UNLINK |MAY_RMDIR ))) +return 0 ; + +if (mask &MAY_UNLINK ) + fsnotify_mask |=FS_UNLINK_PERM ; + +if (mask &MAY_RMDIR ) + fsnotify_mask |=FS_RMDIR_PERM ; + + return fsnotify_parent(dentry, fsnotify_mask, path,
FSNOTIFY_EVENT_PATH);include/linux/fsnotify.h static inline int fsnotify_parent(struct dentry *dentry, __u32 mask,
Quoted 4 lines
include/linux/fsnotify.h +2
-0+} +/* * Simple wrappers to consolidate calls to fsnotify_parent() when an event
Review
Quoted 2 lines
include/linux/fsnotify.h +0
-0* is on a file/dentry. (quoted diff) +0
-0
b/include/linux/fsnotify_backend.hinclude/linux/fsnotify_backend.h line 54
Quoted 5 lines
index
0805b74cae44..0e2e240e8234100644include/linux/fsnotify_backend.h +0
-0@@ -54,6 +54,8 @@#define FS_OPEN_PERM 0x00010000/* open event in an permission hook */
include/linux/fsnotify_backend.h line 55
Quoted 1 line
include/linux/fsnotify_backend.h +0
-0#define FS_ACCESS_PERM 0x00020000/* access event in a permissions hook */
include/linux/fsnotify_backend.h line 56
Quoted 1 line
include/linux/fsnotify_backend.h +0
-0#define FS_OPEN_EXEC_PERM 0x00040000/* open/exec event in a permission hook */
include/linux/fsnotify_backend.h line 57
Quoted 1 line
include/linux/fsnotify_backend.h +1
-0+#define FS_UNLINK_PERM 0x00080000/* unlink event in a permission hook */
include/linux/fsnotify_backend.h line 58
Quoted 1 line
include/linux/fsnotify_backend.h +1
-0+#define FS_RMDIR_PERM 0x00100000/* rmdir event in a permission hook */
include/linux/fsnotify_backend.h line 59
Quoted 2 lines
include/linux/fsnotify_backend.h +0
-0#define FS_EXCL_UNLINK 0x04000000/* do not send events if object is unlinked */
include/linux/fsnotify_backend.h line 81
Quoted 3 lines
include/linux/fsnotify_backend.h +0
-0/* @@ -79,7 +81,9 @@#define ALL_FSNOTIFY_DIRENT_EVENTS (FS_CREATE | FS_DELETE | FS_MOVE |
FS_RENAME)include/linux/fsnotify_backend.h
Quoted 9 lines
include/linux/fsnotify_backend.h +3
-1#define ALL_FSNOTIFY_PERM_EVENTS (FS_OPEN_PERM | FS_ACCESS_PERM | \ - FS_OPEN_EXEC_PERM) + FS_OPEN_EXEC_PERM | \ + FS_UNLINK_PERM | \ + FS_RMDIR_PERM)/* * This is a list of all events that may get sent to a parent that is watching
Quoted 49 lines
security/security.c +10
-2@@ -1160,16 +1160,24 @@ EXPORT_SYMBOL(security_path_mkdir);int security_path_rmdir (const struct path *dir,struct dentry *dentry) { +int ret;if (unlikely (IS_PRIVATE (d_backing_inode (dir->dentry))))return 0 ; -return call_int_hook (path_rmdir,0 , dir, dentry); + ret =call_int_hook (path_rmdir,0 , dir, dentry); +if (ret) +return ret; +return fsnotify_path_perm (dir, dentry,MAY_RMDIR ); }int security_path_unlink (const struct path *dir,struct dentry *dentry) { +int ret;if (unlikely (IS_PRIVATE (d_backing_inode (dir->dentry))))return 0 ; -return call_int_hook (path_unlink,0 , dir, dentry); + ret =call_int_hook (path_unlink,0 , dir, dentry); +if (ret) +return ret; +return fsnotify_path_perm (dir, dentry,MAY_UNLINK ); }EXPORT_SYMBOL (security_path_unlink);security/selinux/hooks.c +4
-1@@ -1801,8 +1801,12 @@ static int may_create(struct inode *dir, }#define MAY_LINK 0 +#ifndef MAY_UNLINK #define MAY_UNLINK 1 +#endif +#ifndef MAY_RMDIR #define MAY_RMDIR 2 +#endif /* Check whether a task can link, unlink, or rmdir a file/directory. */ static int may_link(struct inode *dir, --Quoted 2 lines
2.17.1
--
Jan Kara <[email protected]>
SUSE Labs, CR
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
A message that is not in the archive (sent off-list or not yet received): CAC+1Nxt2NsyA=HpyK=75oaFuKSp9y_ze3JOS2rE0+AEETn5iiQ@mail.gmail.com
Amir Goldstein
reviewerQuoted 5 lines · guowei du
thanks very much for your replay.
I am a starter for kernel filesystem study, i see the newest plan with the 'pre modify events', I think the plan is great and meaningful,I am looking forward to it.
Welcome. Since you are new let me start with some basics.
I don't know what generated the long list of CC that you used,
I suppose it was get_maintainer.pl - this list is way too long and irrelevant I cut it down to the list and maintainers listed in the MAINTAINERS file.
Quoted 6 lines
for the legacy modify events, i mean to implement most blocking events which are not yet done for now, maybe the permission model is old or legacy, and,sure ,expending the blocking events such as unlink/rmdir/rename will do pollute EVENTS namespace in part. but, it is only a little ,maybe all usual blocking events are open/access/rmdir/unlink/rename, they cover some usecases,and other modify events can be only audited or notified.
Sorry, I don't understand what you mean.
Quoted 4 lines
With the fanotify, open/access/rmdir/unlink/rename need to occupy a fsnotify bit to explicitly separate from others.if Blocking event is denied,then there will be no normal events to notify.
Sorry, I don't understand what you mean.
What I meant is that adding different bits for FAN_OPEN and FAN_OPEN_PERM was a mistake that was done a long time ago and we need to live with it. We do NOT need to repeat the same mistake again.
We need to initialize fanotify with class FAN_CLASS_PERM and then when setting events FAN_UNLINK|FAN_RMDIR in mask they will be blocking events which reader will need to allow/deny.
Here is my old example implementation of dir modify permission events that use just one more bit in mask:
https://github.com/amir73il/linux/commits/fsnotify_dirent_perm
This was never designed to be exported to users via fanotify, but it could be extended. I also did not think yet how this could be combined with pre-modify events that have different implementations.
I am just giving that as an example of how only a single new bit can be used to describe blocking events for all the legacy notification events.
Quoted 4 lines
By now ,fanotify is a way that userspace could make choice to allow or deny some events,so I expand fsnotify and use fanotify to do some work.
so,that is why I expand the fsnotify blocking events.
Since you are new, I will try to be very clear about expectations. In order to get the requested changes into the kernel you will have to address the comments that we gave you.
If you do not understand the comments, please ask for clarifications. These will not be the last comments that you will get. Other people may also have more comments on your patches. You will be asked to write tests.
Thanks,
Amir.
A message that is not in the archive (sent off-list or not yet received): CAC+1NxtcFf8XN9BnyOOLWqCkwCw-ozndKTuc3fYuM_Gbs2w92w@mail.gmail.com
Amir Goldstein
reviewerQuoted 5 lines · guowei du
Ok, I understand.
All replies are very important to me,I need to make some changes for my mistakes. I should not do the same wrong things for now.
One more newbie mistake to correct - no "top posting" please. Answers below the questions.
See one more important comment below.
Quoted 45 lines
thanks very much.
Quoted 40 lines · Amir Goldstein
Quoted 5 lines · guowei du
thanks very much for your replay.
I am a starter for kernel filesystem study, i see the newest plan with the 'pre modify events', I think the plan is great and meaningful,I am looking forward to it.
Welcome. Since you are new let me start with some basics.
I don't know what generated the long list of CC that you used,
I suppose it was get_maintainer.pl - this list is way too long and irrelevant I cut it down to the list and maintainers listed in theMAINTAINERSfile.Quoted 6 lines
for the legacy modify events, i mean to implement most blocking events which are not yet done for now, maybe the permission model is old or legacy, and,sure ,expending the blocking events such as unlink/rmdir/rename will do pollute EVENTS namespace in part. but, it is only a little ,maybe all usual blocking events are open/access/rmdir/unlink/rename, they cover some usecases,and other modify events can be only audited or notified.
Sorry, I don't understand what you mean.
Quoted 4 lines
With the fanotify, open/access/rmdir/unlink/rename need to occupy a fsnotify bit to explicitly separate from others.if Blocking event is denied,then there will be no normal events to notify.
Sorry, I don't understand what you mean.
What I meant is that adding different bits forFAN_OPENandFAN_OPEN_PERMwas a mistake that was done a long time ago and we need to live with it. We do NOT need to repeat the same mistake again.We need to initialize fanotify with class
FAN_CLASS_PERMand then when setting events FAN_UNLINK|FAN_RMDIR in mask they will be blocking events which reader will need to allow/deny.Here is my old example implementation of dir modify permission events that use just one more bit in mask:
https://github.com/amir73il/linux/commits/fsnotify_dirent_perm
As you can see in the branch above, this is similar to your patch but more generic.
However, I did not like this approach especially if exporting blocking events to userspace because the hooks are called with directory inode locked.
That means that as long as the monitoring program does not approve an unlink, creation of files in that directory are blocked as well. This could also result in deadlock because userland is not aware of directory locking order.
So IF we are going to support those blocking events in userspace and be aware that it is not at all certina that we will, then those events better be called without the inode lock held as in my pre_modify patches. I can split
#define FS_NAME_INTENT 0x02000000 /* Subfile about to be
linked/unlinked */
To FS_LINK_INTENT and FS_UNLINK_INTENT if needed
that is not a problem, but separate events for RMDIR and UNLINK is an overkill. You will be able to use FAN_ONDIR to request or ignore FS_UNLINK_INTENT events on directories.
I expect to post these patches within month or two.
Thanks,
Amir.
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Guowei,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on pcmoore-selinux/next]
[also build test ERROR on linus/master v5.18-rc5]
[cannot apply to jack-fs/fsnotify next-20220503]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Guowei-Du/fsnotify-add-generic-perm-check-for-unlink-rmdir/20220504-024310 base: https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git next config: hexagon-randconfig-r041-20220501 (https://download.01.org/0day-ci/archive/20220504/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 363b3a645a1e30011cc8da624f13dac5fd915628)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/6f635019bbd2ab22a64e03164c8812a46531966e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Guowei-Du/fsnotify-add-generic-perm-check-for-unlink-rmdir/20220504-024310 git checkout 6f635019bbd2ab22a64e03164c8812a46531966e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> security/security.c:1169:28: error: passing 'const struct path *' to parameter of type 'struct path *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
return fsnotify_path_perm(dir, dentry, MAY_RMDIR);
^~~
include/linux/fsnotify.h:83:51: note: passing argument to parameter 'path' here
static inline int fsnotify_path_perm(struct path *path, struct dentry *dentry, __u32 mask)
^
security/security.c:1180:28: error: passing 'const struct path *' to parameter of type 'struct path *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
return fsnotify_path_perm(dir, dentry, MAY_UNLINK);
^~~
include/linux/fsnotify.h:83:51: note: passing argument to parameter 'path' here
static inline int fsnotify_path_perm(struct path *path, struct dentry *dentry, __u32 mask)
^2 errors generated.
vim +1169 security/security.c
1160
1161 int security_path_rmdir(const struct path *dir, struct dentry *dentry)
1162 {
1163 int ret;
1164 if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry))))
1165 return 0;
1166 ret = call_int_hook(path_rmdir, 0, dir, dentry);
1167 if (ret)
1168 return ret;
> 1169 return fsnotify_path_perm(dir, dentry, MAY_RMDIR);
1170 }
1171
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Guowei,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on pcmoore-selinux/next]
[also build test WARNING on linus/master jmorris-security/next-testing v5.18-rc5] [cannot apply to jack-fs/fsnotify next-20220503]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Guowei-Du/fsnotify-add-generic-perm-check-for-unlink-rmdir/20220504-024310 base: https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git next config: h8300-randconfig-s032-20220501 (https://download.01.org/0day-ci/archive/20220504/[email protected]/config) compiler: h8300-linux-gcc (GCC) 11.3.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # apt-get install sparse # sparse version: v0.6.4-dirty # https://github.com/intel-lab-lkp/linux/commit/6f635019bbd2ab22a64e03164c8812a46531966e git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Guowei-Du/fsnotify-add-generic-perm-check-for-unlink-rmdir/20220504-024310 git checkout 6f635019bbd2ab22a64e03164c8812a46531966e # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=h8300 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
security/security.c:358:25: sparse: sparse: cast removes address space '__rcu' of expression
>> security/security.c:1169:35: sparse: sparse: incorrect type in argument 1 (different modifiers) @@ expected struct path *path @@ got struct path const *dir @@
security/security.c:1169:35: sparse: expected struct path *path
security/security.c:1169:35: sparse: got struct path const *dir
security/security.c:1180:35: sparse: sparse: incorrect type in argument 1 (different modifiers) @@ expected struct path *path @@ got struct path const *dir @@
security/security.c:1180:35: sparse: expected struct path *path
security/security.c:1180:35: sparse: got struct path const *dir
vim +1169 security/security.c
1160
1161 int security_path_rmdir(const struct path *dir, struct dentry *dentry)
1162 {
1163 int ret;
1164 if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry))))
1165 return 0;
1166 ret = call_int_hook(path_rmdir, 0, dir, dentry);
1167 if (ret)
1168 return ret;
> 1169 return fsnotify_path_perm(dir, dentry, MAY_RMDIR);
1170 }
1171
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Guowei,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on pcmoore-selinux/next]
[also build test WARNING on linus/master jmorris-security/next-testing v5.18-rc5] [cannot apply to jack-fs/fsnotify next-20220503]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Guowei-Du/fsnotify-add-generic-perm-check-for-unlink-rmdir/20220504-024310 base: https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git next config: openrisc-buildonly-randconfig-r003-20220501 (https://download.01.org/0day-ci/archive/20220504/[email protected]/config) compiler: or1k-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/6f635019bbd2ab22a64e03164c8812a46531966e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Guowei-Du/fsnotify-add-generic-perm-check-for-unlink-rmdir/20220504-024310 git checkout 6f635019bbd2ab22a64e03164c8812a46531966e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=openrisc SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
security/security.c: In function 'security_path_rmdir':
>> security/security.c:1169:35: warning: passing argument 1 of 'fsnotify_path_perm' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1169 | return fsnotify_path_perm(dir, dentry, MAY_RMDIR);
| ^~~
In file included from security/security.c:24:
include/linux/fsnotify.h:83:51: note: expected 'struct path *' but argument is of type 'const struct path *'
83 | static inline int fsnotify_path_perm(struct path *path, struct dentry *dentry, __u32 mask)
| ~~~~~~~~~~~~~^~~~
security/security.c: In function 'security_path_unlink':
security/security.c:1180:35: warning: passing argument 1 of 'fsnotify_path_perm' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1180 | return fsnotify_path_perm(dir, dentry, MAY_UNLINK);
| ^~~ In file included from security/security.c:24:
include/linux/fsnotify.h:83:51: note: expected 'struct path *' but argument is of type 'const struct path *'
83 | static inline int fsnotify_path_perm(struct path *path, struct dentry *dentry, __u32 mask)
| ~~~~~~~~~~~~~^~~~
vim +1169 security/security.c
1160
1161 int security_path_rmdir(const struct path *dir, struct dentry *dentry)
1162 {
1163 int ret;
1164 if (unlikely(IS_PRIVATE(d_backing_inode(dir->dentry))))
1165 return 0;
1166 ret = call_int_hook(path_rmdir, 0, dir, dentry);
1167 if (ret)
1168 return ret;
> 1169 return fsnotify_path_perm(dir, dentry, MAY_RMDIR);
1170 }
1171
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Paul Moore
maintainerQuoted 17 lines · Guowei Du
From: duguowei <[email protected]>
For now, there have been open/access/open_exec perms for file operation, so we add new perms check with unlink/rmdir syscall. if one app deletes any file/dir within pubic area, fsnotify can sends
fsnotify_eventto listener to deny that, even if the app have right dac/mac permissions.Signed-off-by duguowei <[email protected]>--- fs/notify/fsnotify.c | 2 +- include/linux/fs.h | 2 ++ include/linux/fsnotify.h | 16 ++++++++++++++++ include/linux/fsnotify_backend.h | 6 +++++- security/security.c | 12 ++++++++++-- security/selinux/hooks.c | 4 ++++ 6 files changed, 38 insertions(+), 4 deletions(-)
...
Quoted 5 lines
security/selinux/hooks.c +0
-0
security/selinux/hooks.c static int may_create(struct inode *dir, · line 1809
Quoted 9 lines
security/selinux/hooks.c +4
-0@@ -1801,8 +1801,12 @@ static int may_create(struct inode *dir, }#define MAY_LINK 0 +#ifndef MAY_UNLINK #define MAY_UNLINK 1 +#endif +#ifndef MAY_RMDIR #define MAY_RMDIR 2 +#endif
In the future if you run into a symbol collision here I would prefer if you renamed the SELinux constants to something like SEL_MAY_LINK, etc.
Signature · 1 line
paul-moore.com