mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
4d8cbf6dbc
Memory for 'struct omfs_extent' and a 'e_extent_count' number of extent
entries is indirectly allocated through 'bh->b_data', which is a pointer
to data within the page. This implies that the member 'e_entry'
(which is the start of extent entries) functions more like an array than
a single object of type 'struct omfs_extent_entry'.
So we better turn this object into a proper array, in this case a
flexible-array member, and with that, fix the following
-Wstringop-overflow warning seen after building s390 architecture with
allyesconfig (GCC 13):
fs/omfs/file.c: In function 'omfs_grow_extent':
include/linux/fortify-string.h:57:33: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=]
57 | #define __underlying_memcpy __builtin_memcpy
| ^
include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy'
648 | __underlying_##op(p, q, __fortify_size); \
| ^~~~~~~~~~~~~
include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk'
693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \
| ^~~~~~~~~~~~~~~~~~~~
fs/omfs/file.c:170:9: note: in expansion of macro 'memcpy'
170 | memcpy(terminator, entry, sizeof(struct omfs_extent_entry));
| ^~~~~~
In file included from fs/omfs/omfs.h:8,
from fs/omfs/file.c:11:
fs/omfs/omfs_fs.h:80:34: note: at offset 16 into destination object 'e_entry' of size 16
80 | struct omfs_extent_entry e_entry; /* start of extent entries */
| ^~~~~~~
There are some binary differences before and after changes, but this are
expected due to the change in the size of 'struct omfs_extent' and the
necessary adjusments.
This helps with the ongoing efforts to globally enable
-Wstringop-overflow.
Link: https://github.com/KSPP/linux/issues/330
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
83 lines
2.5 KiB
C
83 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _OMFS_FS_H
|
|
#define _OMFS_FS_H
|
|
|
|
/* OMFS On-disk structures */
|
|
|
|
#define OMFS_MAGIC 0xC2993D87
|
|
#define OMFS_IMAGIC 0xD2
|
|
|
|
#define OMFS_DIR 'D'
|
|
#define OMFS_FILE 'F'
|
|
#define OMFS_INODE_NORMAL 'e'
|
|
#define OMFS_INODE_CONTINUATION 'c'
|
|
#define OMFS_INODE_SYSTEM 's'
|
|
#define OMFS_NAMELEN 256
|
|
#define OMFS_DIR_START 0x1b8
|
|
#define OMFS_EXTENT_START 0x1d0
|
|
#define OMFS_EXTENT_CONT 0x40
|
|
#define OMFS_XOR_COUNT 19
|
|
#define OMFS_MAX_BLOCK_SIZE 8192
|
|
#define OMFS_MAX_CLUSTER_SIZE 8
|
|
#define OMFS_MAX_BLOCKS (1ul << 31)
|
|
|
|
struct omfs_super_block {
|
|
char s_fill1[256];
|
|
__be64 s_root_block; /* block number of omfs_root_block */
|
|
__be64 s_num_blocks; /* total number of FS blocks */
|
|
__be32 s_magic; /* OMFS_MAGIC */
|
|
__be32 s_blocksize; /* size of a block */
|
|
__be32 s_mirrors; /* # of mirrors of system blocks */
|
|
__be32 s_sys_blocksize; /* size of non-data blocks */
|
|
};
|
|
|
|
struct omfs_header {
|
|
__be64 h_self; /* FS block where this is located */
|
|
__be32 h_body_size; /* size of useful data after header */
|
|
__be16 h_crc; /* crc-ccitt of body_size bytes */
|
|
char h_fill1[2];
|
|
u8 h_version; /* version, always 1 */
|
|
char h_type; /* OMFS_INODE_X */
|
|
u8 h_magic; /* OMFS_IMAGIC */
|
|
u8 h_check_xor; /* XOR of header bytes before this */
|
|
__be32 h_fill2;
|
|
};
|
|
|
|
struct omfs_root_block {
|
|
struct omfs_header r_head; /* header */
|
|
__be64 r_fill1;
|
|
__be64 r_num_blocks; /* total number of FS blocks */
|
|
__be64 r_root_dir; /* block # of root directory */
|
|
__be64 r_bitmap; /* block # of free space bitmap */
|
|
__be32 r_blocksize; /* size of a block */
|
|
__be32 r_clustersize; /* size allocated for data blocks */
|
|
__be64 r_mirrors; /* # of mirrors of system blocks */
|
|
char r_name[OMFS_NAMELEN]; /* partition label */
|
|
};
|
|
|
|
struct omfs_inode {
|
|
struct omfs_header i_head; /* header */
|
|
__be64 i_parent; /* parent containing this inode */
|
|
__be64 i_sibling; /* next inode in hash bucket */
|
|
__be64 i_ctime; /* ctime, in milliseconds */
|
|
char i_fill1[35];
|
|
char i_type; /* OMFS_[DIR,FILE] */
|
|
__be32 i_fill2;
|
|
char i_fill3[64];
|
|
char i_name[OMFS_NAMELEN]; /* filename */
|
|
__be64 i_size; /* size of file, in bytes */
|
|
};
|
|
|
|
struct omfs_extent_entry {
|
|
__be64 e_cluster; /* start location of a set of blocks */
|
|
__be64 e_blocks; /* number of blocks after e_cluster */
|
|
};
|
|
|
|
struct omfs_extent {
|
|
__be64 e_next; /* next extent table location */
|
|
__be32 e_extent_count; /* total # extents in this table */
|
|
__be32 e_fill;
|
|
struct omfs_extent_entry e_entry[]; /* start of extent entries */
|
|
};
|
|
|
|
#endif
|