diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-13 10:17:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-13 10:17:10 +0100 |
| commit | af40d16042d674442db8cf5fd654fabcd45fea44 (patch) | |
| tree | 56f80d083a4a7236a0ee7914ef2baa8222d65494 /fs/file.c | |
| parent | binder: fix pointer cast warning (diff) | |
| parent | Linux 5.16-rc5 (diff) | |
| download | linux-dev-af40d16042d674442db8cf5fd654fabcd45fea44.tar.xz linux-dev-af40d16042d674442db8cf5fd654fabcd45fea44.zip | |
Merge v5.15-rc5 into char-misc-next
We need the fixes in here as well, and also resolve some merge conflicts
in:
drivers/misc/eeprom/at25.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/file.c b/fs/file.c index 8627dacfc424..ad4a8bf3cf10 100644 --- a/fs/file.c +++ b/fs/file.c @@ -858,6 +858,10 @@ loop: file = NULL; else if (!get_file_rcu_many(file, refs)) goto loop; + else if (files_lookup_fd_raw(files, fd) != file) { + fput_many(file, refs); + goto loop; + } } rcu_read_unlock(); |