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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 13 May 2017 11:34:56 +0300 From: Cyrill Gorcunov <gorcunov@...il.com> To: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org, linux-api@...r.kernel.org Cc: viro@...iv.linux.org.uk, akpm@...uxfoundation.org, avagin@...tuozzo.com, xemul@...tuozzo.com, mtk.manpages@...il.com, avagin@...nvz.org, jbaron@...mai.com, luto@...capital.net Subject: [PATCH linux-next] kcmp: fs/epoll -- Wrap kcmp code with CONFIG_CHECKPOINT_RESTORE kcmp syscall is build iif CONFIG_CHECKPOINT_RESTORE is selected, so wrap appropriate helpers in epoll code with the config to build it conditionally. Signed-off-by: Cyrill Gorcunov <gorcunov@...nvz.org> Reported-by: Andrew Morton <akpm@...uxfoundation.org> CC: Andrey Vagin <avagin@...nvz.org> CC: Al Viro <viro@...iv.linux.org.uk> CC: Pavel Emelyanov <xemul@...tuozzo.com> CC: Michael Kerrisk <mtk.manpages@...il.com> CC: Jason Baron <jbaron@...mai.com> CC: Andy Lutomirski <luto@...capital.net> --- fs/eventpoll.c | 2 ++ include/linux/eventpoll.h | 2 ++ 2 files changed, 4 insertions(+) Index: linux-ml.git/fs/eventpoll.c =================================================================== --- linux-ml.git.orig/fs/eventpoll.c +++ linux-ml.git/fs/eventpoll.c @@ -1077,6 +1077,7 @@ static struct epitem *ep_find(struct eve return epir; } +#ifdef CONFIG_CHECKPOINT_RESTORE static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long toff) { struct rb_node *rbp; @@ -1118,6 +1119,7 @@ struct file *get_epoll_tfile_raw_ptr(str return file_raw; } +#endif /* CONFIG_CHECKPOINT_RESTORE */ /* * This is the callback that is passed to the wait queue wakeup Index: linux-ml.git/include/linux/eventpoll.h =================================================================== --- linux-ml.git.orig/include/linux/eventpoll.h +++ linux-ml.git/include/linux/eventpoll.h @@ -23,7 +23,9 @@ struct file; #ifdef CONFIG_EPOLL +#ifdef CONFIG_CHECKPOINT_RESTORE struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long toff); +#endif /* Used to initialize the epoll bits inside the "struct file" */ static inline void eventpoll_init_file(struct file *file)
Powered by blists - more mailing lists