hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hfsplus: use struct_group_attr() for memcpy() region 

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.

Add struct_group() to mark the "info" region (containing struct DInfo
and struct DXInfo structs) in struct hfsplus_cat_folder and struct
hfsplus_cat_file that are written into directly, so the compiler can
correctly reason about the expected size of the writes.

"pahole" shows no size nor member offset changes to struct
hfsplus_cat_folder nor struct hfsplus_cat_file.  "objdump -d" shows no
object code changes.

Link: https://lkml.kernel.org/r/20211119192851.1046717-1-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kees Cook 2022-01-19 18:09:47 -08:00 committed by Linus Torvalds
parent e1ce8a97be
commit e35fa567a0
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/hfsplus/hfsplus_raw.h
View File

@ -260,8 +260,10 @@ struct hfsplus_cat_folder {
__be32 access_date; __be32 access_date;
__be32 backup_date; __be32 backup_date;
struct hfsplus_perm permissions; struct hfsplus_perm permissions;
struct DInfo user_info; struct_group_attr(info, __packed,
struct DXInfo finder_info; struct DInfo user_info;
struct DXInfo finder_info;
);
__be32 text_encoding; __be32 text_encoding;
__be32 subfolders; /* Subfolder count in HFSX. Reserved in HFS+. */ __be32 subfolders; /* Subfolder count in HFSX. Reserved in HFS+. */
} __packed; } __packed;
@ -294,8 +296,10 @@ struct hfsplus_cat_file {
__be32 access_date; __be32 access_date;
__be32 backup_date; __be32 backup_date;
struct hfsplus_perm permissions; struct hfsplus_perm permissions;
struct FInfo user_info; struct_group_attr(info, __packed,
struct FXInfo finder_info; struct FInfo user_info;
struct FXInfo finder_info;
);
__be32 text_encoding; __be32 text_encoding;
u32 reserved2; u32 reserved2;

4
fs/hfsplus/xattr.c
View File

@ -296,7 +296,7 @@ int __hfsplus_setxattr(struct inode *inode, const char *name,
sizeof(hfsplus_cat_entry)); sizeof(hfsplus_cat_entry));
if (be16_to_cpu(entry.type) == HFSPLUS_FOLDER) { if (be16_to_cpu(entry.type) == HFSPLUS_FOLDER) {
if (size == folder_finderinfo_len) { if (size == folder_finderinfo_len) {
memcpy(&entry.folder.user_info, value, memcpy(&entry.folder.info, value,
folder_finderinfo_len); folder_finderinfo_len);
hfs_bnode_write(cat_fd.bnode, &entry, hfs_bnode_write(cat_fd.bnode, &entry,
cat_fd.entryoffset, cat_fd.entryoffset,
@ -309,7 +309,7 @@ int __hfsplus_setxattr(struct inode *inode, const char *name,
} }
} else if (be16_to_cpu(entry.type) == HFSPLUS_FILE) { } else if (be16_to_cpu(entry.type) == HFSPLUS_FILE) {
if (size == file_finderinfo_len) { if (size == file_finderinfo_len) {
memcpy(&entry.file.user_info, value, memcpy(&entry.file.info, value,
file_finderinfo_len); file_finderinfo_len);
hfs_bnode_write(cat_fd.bnode, &entry, hfs_bnode_write(cat_fd.bnode, &entry,
cat_fd.entryoffset, cat_fd.entryoffset,