mbox series

[5.10,0/5] aio poll fixes for 5.10

Message ID 20211210234805.39861-1-ebiggers@kernel.org
Headers show
Series aio poll fixes for 5.10 | expand

Message

Eric Biggers Dec. 10, 2021, 11:48 p.m. UTC
Backport the aio poll fixes to 5.10.  This resolves a conflict in
aio_poll_wake() in patch 4.  It's a "trivial" conflict, but I'm sending
this to make sure it doesn't get dropped.

Eric Biggers (5):
  wait: add wake_up_pollfree()
  binder: use wake_up_pollfree()
  signalfd: use wake_up_pollfree()
  aio: keep poll requests on waitqueue until completed
  aio: fix use-after-free due to missing POLLFREE handling

 drivers/android/binder.c        |  21 ++--
 fs/aio.c                        | 184 ++++++++++++++++++++++++++------
 fs/signalfd.c                   |  12 +--
 include/linux/wait.h            |  26 +++++
 include/uapi/asm-generic/poll.h |   2 +-
 kernel/sched/wait.c             |   7 ++
 6 files changed, 195 insertions(+), 57 deletions(-)

Comments

Greg KH Dec. 12, 2021, 1:54 p.m. UTC | #1
On Fri, Dec 10, 2021 at 03:48:00PM -0800, Eric Biggers wrote:
> Backport the aio poll fixes to 5.10.  This resolves a conflict in
> aio_poll_wake() in patch 4.  It's a "trivial" conflict, but I'm sending
> this to make sure it doesn't get dropped.
> 
> Eric Biggers (5):
>   wait: add wake_up_pollfree()
>   binder: use wake_up_pollfree()
>   signalfd: use wake_up_pollfree()
>   aio: keep poll requests on waitqueue until completed
>   aio: fix use-after-free due to missing POLLFREE handling
> 
>  drivers/android/binder.c        |  21 ++--
>  fs/aio.c                        | 184 ++++++++++++++++++++++++++------
>  fs/signalfd.c                   |  12 +--
>  include/linux/wait.h            |  26 +++++
>  include/uapi/asm-generic/poll.h |   2 +-
>  kernel/sched/wait.c             |   7 ++
>  6 files changed, 195 insertions(+), 57 deletions(-)
> 
> -- 
> 2.34.1
> 

Thanks for all of the backports, much appreciated and now queued up.

greg k-h
Eric Biggers Dec. 12, 2021, 7:46 p.m. UTC | #2
On Sun, Dec 12, 2021 at 02:54:45PM +0100, Greg KH wrote:
> On Fri, Dec 10, 2021 at 03:48:00PM -0800, Eric Biggers wrote:
> > Backport the aio poll fixes to 5.10.  This resolves a conflict in
> > aio_poll_wake() in patch 4.  It's a "trivial" conflict, but I'm sending
> > this to make sure it doesn't get dropped.
> > 
> > Eric Biggers (5):
> >   wait: add wake_up_pollfree()
> >   binder: use wake_up_pollfree()
> >   signalfd: use wake_up_pollfree()
> >   aio: keep poll requests on waitqueue until completed
> >   aio: fix use-after-free due to missing POLLFREE handling
> > 
> >  drivers/android/binder.c        |  21 ++--
> >  fs/aio.c                        | 184 ++++++++++++++++++++++++++------
> >  fs/signalfd.c                   |  12 +--
> >  include/linux/wait.h            |  26 +++++
> >  include/uapi/asm-generic/poll.h |   2 +-
> >  kernel/sched/wait.c             |   7 ++
> >  6 files changed, 195 insertions(+), 57 deletions(-)
> > 
> > -- 
> > 2.34.1
> > 
> 
> Thanks for all of the backports, much appreciated and now queued up.
> 
> greg k-h

Thanks!  Can you apply the following commit to 5.15-stable too?  I missed that
it's needed in 5.15:

	commit 4b3749865374899e115aa8c48681709b086fe6d3
	Author: Xie Yongji <xieyongji@bytedance.com>
	Date:   Mon Sep 13 19:19:28 2021 +0800

	    aio: Fix incorrect usage of eventfd_signal_allowed()
Greg KH Dec. 13, 2021, 8:14 a.m. UTC | #3
On Sun, Dec 12, 2021 at 11:46:03AM -0800, Eric Biggers wrote:
> On Sun, Dec 12, 2021 at 02:54:45PM +0100, Greg KH wrote:
> > On Fri, Dec 10, 2021 at 03:48:00PM -0800, Eric Biggers wrote:
> > > Backport the aio poll fixes to 5.10.  This resolves a conflict in
> > > aio_poll_wake() in patch 4.  It's a "trivial" conflict, but I'm sending
> > > this to make sure it doesn't get dropped.
> > > 
> > > Eric Biggers (5):
> > >   wait: add wake_up_pollfree()
> > >   binder: use wake_up_pollfree()
> > >   signalfd: use wake_up_pollfree()
> > >   aio: keep poll requests on waitqueue until completed
> > >   aio: fix use-after-free due to missing POLLFREE handling
> > > 
> > >  drivers/android/binder.c        |  21 ++--
> > >  fs/aio.c                        | 184 ++++++++++++++++++++++++++------
> > >  fs/signalfd.c                   |  12 +--
> > >  include/linux/wait.h            |  26 +++++
> > >  include/uapi/asm-generic/poll.h |   2 +-
> > >  kernel/sched/wait.c             |   7 ++
> > >  6 files changed, 195 insertions(+), 57 deletions(-)
> > > 
> > > -- 
> > > 2.34.1
> > > 
> > 
> > Thanks for all of the backports, much appreciated and now queued up.
> > 
> > greg k-h
> 
> Thanks!  Can you apply the following commit to 5.15-stable too?  I missed that
> it's needed in 5.15:
> 
> 	commit 4b3749865374899e115aa8c48681709b086fe6d3
> 	Author: Xie Yongji <xieyongji@bytedance.com>
> 	Date:   Mon Sep 13 19:19:28 2021 +0800
> 
> 	    aio: Fix incorrect usage of eventfd_signal_allowed()

Now queued up, thanks.

greg k-h