Hi Linus, Could you pull these two commits, assuming Daniel doesn't object? The first is the fix for the strnlen() array limit check and the second fixes the calculation of the number of dirent records used to represent any particular filename length. I've added Tested-bys for Marc Dionne into the branch, but otherwise the patches should be the same as have been on the branch since the 23rd (was commit 587f19fc90c1). David --- The following changes since commit a409ed156a90093a03fe6a93721ddf4c591eac87: Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio (2020-12-17 18:07:20 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/afs-fixes-04012021 for you to fetch changes up to 366911cd762db02c2dd32fad1be96b72a66f205d: afs: Fix directory entry size calculation (2021-01-04 12:25:19 +0000) ---------------------------------------------------------------- AFS fixes ---------------------------------------------------------------- David Howells (2): afs: Work around strnlen() oops with CONFIG_FORTIFIED_SOURCE=y afs: Fix directory entry size calculation fs/afs/dir.c | 49 ++++++++++++++++++++++++---------------------- fs/afs/dir_edit.c | 6 ++---- fs/afs/xdr_fs.h | 25 +++++++++++++++++++---- include/trace/events/afs.h | 2 ++ 4 files changed, 51 insertions(+), 31 deletions(-)