linux-kernel - Re: [PATCH 06/14] Move ep_take_care_of

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 10 Feb 2023 15:45:10 +0100
From:   Thomas Huth <thuth@...hat.com>
To:     Palmer Dabbelt <palmer@...belt.com>, viro@...iv.linux.org.uk,
        linux-api@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     ast@...mgrid.com, aishchuk@...ux.vnet.ibm.com, aarcange@...hat.com,
        akpm@...ux-foundation.org, luto@...nel.org, acme@...nel.org,
        bhe@...hat.com, 3chas3@...il.com, chris@...kel.net, dave@...1.net,
        dyoung@...hat.com, drysdale@...gle.com, ebiederm@...ssion.com,
        geoff@...radead.org, gregkh@...uxfoundation.org, hpa@...or.com,
        mingo@...nel.org, iulia.manda21@...il.com, plagnioj@...osoft.com,
        jikos@...nel.org, josh@...htriplett.org,
        linux-arch@...r.kernel.org, linux-fsdevel@...r.kernel.org,
        mathieu.desnoyers@...icios.com, jcmvbkbc@...il.com,
        paulmck@...ux.vnet.ibm.com, a.p.zijlstra@...llo.nl,
        tglx@...utronix.de, tomi.valkeinen@...com, vgoyal@...hat.com,
        x86@...nel.org, arnd@...db.de, dhowells@...hat.com,
        peterz@...radead.org, Jens Axboe <axboe@...nel.dk>
Subject: Re: [PATCH 06/14] Move ep_take_care_of_epollwakeup() to
 fs/eventpoll.c

On 10/11/2015 02.31, Palmer Dabbelt wrote:
> This doesn't make any sense to expose to userspace, so it's been moved
> to the one user.  This was introduced by commit 95f19f658ce1 ("epoll:
> drop EPOLLWAKEUP if PM_SLEEP is disabled").
> 
> Signed-off-by: Palmer Dabbelt <palmer@...belt.com>
> Reviewed-by: Andrew Waterman <waterman@...s.berkeley.edu>
> Reviewed-by: Albert Ou <aou@...s.berkeley.edu>
> ---
>   fs/eventpoll.c                 | 13 +++++++++++++
>   include/uapi/linux/eventpoll.h | 12 ------------
>   2 files changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/eventpoll.c b/fs/eventpoll.c
> index 1e009ca..aadee3d 100644
> --- a/fs/eventpoll.c
> +++ b/fs/eventpoll.c
> @@ -1812,6 +1812,19 @@ SYSCALL_DEFINE1(epoll_create, int, size)
>   	return sys_epoll_create1(0);
>   }
>   
> +#ifdef CONFIG_PM_SLEEP
> +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
> +{
> +	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
> +		epev->events &= ~EPOLLWAKEUP;
> +}
> +#else
> +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
> +{
> +	epev->events &= ~EPOLLWAKEUP;
> +}
> +#endif
> +
>   /*
>    * The following function implements the controller interface for
>    * the eventpoll file that enables the insertion/removal/change of
> diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h
> index bc81fb2..7850373 100644
> --- a/include/uapi/linux/eventpoll.h
> +++ b/include/uapi/linux/eventpoll.h
> @@ -61,16 +61,4 @@ struct epoll_event {
>   	__u64 data;
>   } EPOLL_PACKED;
>   
> -#ifdef CONFIG_PM_SLEEP
> -static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
> -{
> -	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
> -		epev->events &= ~EPOLLWAKEUP;
> -}
> -#else
> -static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
> -{
> -	epev->events &= ~EPOLLWAKEUP;
> -}
> -#endif
>   #endif /* _UAPI_LINUX_EVENTPOLL_H */

  Hi!

Looks like this patch has never been merged? ... I just came across this 
"#ifdef CONFIG_..." in the uapi directory, and it also seems wrong to me to 
check CONFIG_* switches here, so could somebody maybe pick this patch up now 
and merge it?

  Thanks,
   Thomas