From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Nov 2021 18:51:12 +0000 (-0800)
Subject: Merge tag 'ovl-update-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
X-Git-Tag: v6.6.17~8873
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bdd629e5aa0e335504304be4208935948692549;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'ovl-update-5.16' of git://git./linux/kernel/git/mszeredi/vfs

Pull overlayfs updates from Miklos Szeredi:

 - Fix a regression introduced in the last cycle

 - Fix a use-after-free in the AIO path

 - Fix a bogus warning reported by syzbot

* tag 'ovl-update-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fix filattr copy-up failure
  ovl: fix warning in ovl_create_real()
  ovl: fix use after free in struct ovl_aio_req
---

1bdd629e5aa0e335504304be4208935948692549
diff --cc fs/overlayfs/file.c
index ac461a4,44fea16..fa125fe
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@@ -268,11 -277,10 +277,10 @@@ static void ovl_aio_cleanup_handler(str
  	}
  
  	orig_iocb->ki_pos = iocb->ki_pos;
- 	fdput(aio_req->fd);
- 	kmem_cache_free(ovl_aio_request_cachep, aio_req);
+ 	ovl_aio_put(aio_req);
  }
  
 -static void ovl_aio_rw_complete(struct kiocb *iocb, long res, long res2)
 +static void ovl_aio_rw_complete(struct kiocb *iocb, long res)
  {
  	struct ovl_aio_req *aio_req = container_of(iocb,
  						   struct ovl_aio_req, iocb);