| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 12 Nov 2008 11:12:01 -0500
From: Eric Paris <eparis@...hat.com>
To: linux-kernel@...r.kernel.org, malware-list@...ts.printk.net
Cc: viro@...iv.linux.org.uk, alan@...rguk.ukuu.org.uk,
arjan@...radead.org, greg@...ah.com, tytso@....edu,
akpm@...ux-foundation.org
Subject: [PATCH =-v3 18/21] fanotify: all userspace to set timeouts
fanotify when used to make access decisions has a default 5 second timeout.
This patch will allow userspace listeners to change their timeout on a
group wide basis. Userspace listeners will still be able to reset the
timeout for individual events.
Signed-off-by: Eric Paris <eparis@...hat.com>
---
fs/notify/access.c | 2 +-
fs/notify/fanotify.h | 1 -
fs/notify/group.c | 2 ++
include/linux/fanotify.h | 8 ++++++++
net/fanotify/af_fanotify.c | 9 +++++++++
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/fs/notify/access.c b/fs/notify/access.c
index 5b3b32e..0c04a60 100644
--- a/fs/notify/access.c
+++ b/fs/notify/access.c
@@ -59,7 +59,7 @@ int fanotify_get_response_from_access(struct fanotify_group *group, struct fanot
retry:
ret = wait_event_interruptible_timeout(group->access_waitq,
event->response,
- msecs_to_jiffies(5000));
+ msecs_to_jiffies(group->timeout));
/* Timeout or signal? */
if (ret <= 0) {
struct fanotify_event_holder *holder;
diff --git a/fs/notify/fanotify.h b/fs/notify/fanotify.h
index 2721da2..a370ff9 100644
--- a/fs/notify/fanotify.h
+++ b/fs/notify/fanotify.h
@@ -98,7 +98,6 @@ extern __init int fanotify_notification_uninit(void);
extern void fanotify_fastpath_get(struct fanotify_fastpath_entry *entry);
extern void fanotify_fastpath_put(struct fanotify_fastpath_entry *entry);
extern int fanotify_is_fastpath(struct file *file, unsigned int mask, struct fanotify_group *group);
-extern void fanotify_fastpath_clear_group(struct fanotify_group *group);
extern void fanotify_fastpath_clear(struct inode *inode);
extern __init int fanotify_fastpath_init(void);
extern __init int fanotify_fastpath_uninit(void);
diff --git a/fs/notify/group.c b/fs/notify/group.c
index 68f895e..650f31e 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -84,6 +84,8 @@ struct fanotify_group *fanotify_find_group(unsigned int priority, unsigned int g
INIT_LIST_HEAD(&group->access_list);
init_waitqueue_head(&group->access_waitq);
+ group->timeout = 5000;
+
/* Do we need to be the first entry? */
if (list_empty(&fanotify_groups)) {
list_add_rcu(&group->group_list, &fanotify_groups);
diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index b7ab01f..c6a2a3c 100644
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -90,6 +90,7 @@ struct fanotify_so_access {
#define FANOTIFY_SET_FASTPATH 1
#define FANOTIFY_SEND_RESPONSE 2
#define FANOTIFY_CLEAR_ALL_FASTPATH 3
+#define FANOTIFY_SET_TIMEOUT 4
#ifdef __KERNEL__
@@ -121,6 +122,8 @@ struct fanotify_group {
struct list_head access_list; /* event_holder we need an answer from userspace */
wait_queue_head_t access_waitq; /* we wait here for userspace access decisions */
+ unsigned int timeout; /* timeout to wait for access requests in msec */
+
unsigned int priority; /* order this group should receive msgs. low first */
};
@@ -137,6 +140,7 @@ extern void fanotify_put_group(struct fanotify_group *group);
extern int fanotify_create_event_fd(struct fanotify_group *group, struct fanotify_event_metadata *data, int nonblock);
extern int fanotify_fastpath_add(struct fanotify_group *group, int fd, unsigned int mask);
extern int fanotify_process_access_response(struct fanotify_group *group, unsigned long cookie, unsigned int response);
+extern void fanotify_fastpath_clear_group(struct fanotify_group *group);
#else
@@ -175,6 +179,10 @@ static inline int fanotify_process_access_response(struct fanotify_group *group,
return 0;
}
+static inline void fanotify_fastpath_clear_group(struct fanotify_group *group)
+{}
+
+
#endif /* CONFIG_FANOTIFY */
#endif /* __KERNEL __ */
diff --git a/net/fanotify/af_fanotify.c b/net/fanotify/af_fanotify.c
index 7c98a22..f56984e 100644
--- a/net/fanotify/af_fanotify.c
+++ b/net/fanotify/af_fanotify.c
@@ -163,6 +163,7 @@ static int fan_setsockopt(struct socket *sock, int level, int optname, char __us
union {
struct fanotify_so_fastpath fastpath;
struct fanotify_so_access access;
+ uint32_t timeout;
} data;
int ret = 0;
@@ -195,6 +196,14 @@ static int fan_setsockopt(struct socket *sock, int level, int optname, char __us
case FANOTIFY_CLEAR_ALL_FASTPATH:
fanotify_fastpath_clear_group(group);
break;
+ case FANOTIFY_SET_TIMEOUT:
+ if (optlen < sizeof(uint32_t))
+ return -ENOMEM;
+ ret = copy_from_user(&data.timeout, optval, sizeof(uint32_t));
+ if (ret)
+ return ret;
+ group->timeout = data.timeout;
+ break;
default:
return -ENOPROTOOPT;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists