OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ovl: Use "buf" flexible array for memcpy() destination 

commit cf8aa9bf97 upstream.

The "buf" flexible array needs to be the memcpy() destination to avoid
false positive run-time warning from the recent FORTIFY_SOURCE
hardening:

  memcpy: detected field-spanning write (size 93) of single field "&fh->fb"
  at fs/overlayfs/export.c:799 (size 21)

Reported-by: syzbot+9d14351a171d0d1c7955@syzkaller.appspotmail.com
Link: https://lore.kernel.org/all/000000000000763a6c05e95a5985@google.com/
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2022-09-24 00:33:15 -07:00 committed by Greg Kroah-Hartman
parent 543bba3be2
commit 07a96977b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/overlayfs/export.c
View File

@ -796,7 +796,7 @@ static struct ovl_fh *ovl_fid_to_fh(struct fid *fid, int buflen, int fh_type)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
/* Copy unaligned inner fh into aligned buffer */ /* Copy unaligned inner fh into aligned buffer */
memcpy(&fh->fb, fid, buflen - OVL_FH_WIRE_OFFSET); memcpy(fh->buf, fid, buflen - OVL_FH_WIRE_OFFSET);
return fh; return fh;
} }

2
fs/overlayfs/overlayfs.h
View File

@ -108,7 +108,7 @@ struct ovl_fh {
u8 padding[3]; /* make sure fb.fid is 32bit aligned */ u8 padding[3]; /* make sure fb.fid is 32bit aligned */
union { union {
struct ovl_fb fb; struct ovl_fb fb;
u8 buf[0]; DECLARE_FLEX_ARRAY(u8, buf);
}; };
} __packed; } __packed;