From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Nov 2022 19:06:09 +0000 (-0800)
Subject: Merge tag '9p-for-6.1-rc7' of https://github.com/martinetd/linux
X-Git-Tag: v6.1~88
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd64898dfed510a55b66080f8ab5c9b06982bbce;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag '9p-for-6.1-rc7' of https://github.com/martinetd/linux

Pull 9p fixes from Dominique Martinet:

 - 9p now uses a variable size for its recv buffer, but every place
   hadn't been updated properly to use it and some buffer overflows have
   been found and needed fixing.

   There's still one place where msize is incorrectly used in a safety
   check (p9_check_errors), but all paths leading to it should already
   be avoiding overflows and that patch took a bit more time to get
   right for zero-copy requests so I'll send it for 6.2

 - yet another race condition in p9_conn_cancel introduced by a fix for
   a syzbot report in the same place. Maybe at some point we'll get it
   right without burning it all down...

* tag '9p-for-6.1-rc7' of https://github.com/martinetd/linux:
  9p/xen: check logical size for buffer size
  9p/fd: Use P9_HDRSZ for header size
  9p/fd: Fix write overflow in p9_read_work
  9p/fd: fix issue of list_del corruption in p9_fd_cancel()
---

fd64898dfed510a55b66080f8ab5c9b06982bbce