]> git.dujemihanovic.xyz Git - linux.git/commit
smb: client: Fix struct_group() usage in __packed structs
authorGustavo A. R. Silva <gustavoars@kernel.org>
Wed, 24 Apr 2024 02:41:22 +0000 (20:41 -0600)
committerSteve French <stfrench@microsoft.com>
Wed, 24 Apr 2024 06:06:13 +0000 (01:06 -0500)
commit9a1f1d04f63c59550a5364858b46eeffdf03e8d6
tree6af3873812fb33cc951126950888454726193fdc
parent9d1ddab261f3e2af7c384dc02238784ce0cf9f98
smb: client: Fix struct_group() usage in __packed structs

Use struct_group_attr() in __packed structs, instead of struct_group().

Below you can see the pahole output before/after changes:

pahole -C smb2_file_network_open_info fs/smb/client/smb2ops.o
struct smb2_file_network_open_info {
union {
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le64     AllocationSize;       /*    32     8 */
__le64     EndOfFile;            /*    40     8 */
__le32     Attributes;           /*    48     4 */
};                                       /*     0    56 */
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le64     AllocationSize;       /*    32     8 */
__le64     EndOfFile;            /*    40     8 */
__le32     Attributes;           /*    48     4 */
} network_open_info;                     /*     0    56 */
};                                               /*     0    56 */
__le32                     Reserved;             /*    56     4 */

/* size: 60, cachelines: 1, members: 2 */
/* last cacheline: 60 bytes */
} __attribute__((__packed__));

pahole -C smb2_file_network_open_info fs/smb/client/smb2ops.o
struct smb2_file_network_open_info {
union {
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le64     AllocationSize;       /*    32     8 */
__le64     EndOfFile;            /*    40     8 */
__le32     Attributes;           /*    48     4 */
} __attribute__((__packed__));           /*     0    52 */
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le64     AllocationSize;       /*    32     8 */
__le64     EndOfFile;            /*    40     8 */
__le32     Attributes;           /*    48     4 */
} __attribute__((__packed__)) network_open_info;       /*     0    52 */
};                                               /*     0    52 */
__le32                     Reserved;             /*    52     4 */

/* size: 56, cachelines: 1, members: 2 */
/* last cacheline: 56 bytes */
};

pahole -C smb_com_open_rsp fs/smb/client/cifssmb.o
struct smb_com_open_rsp {
...

union {
struct {
__le64     CreationTime;         /*    48     8 */
__le64     LastAccessTime;       /*    56     8 */
/* --- cacheline 1 boundary (64 bytes) --- */
__le64     LastWriteTime;        /*    64     8 */
__le64     ChangeTime;           /*    72     8 */
__le32     FileAttributes;       /*    80     4 */
};                                       /*    48    40 */
struct {
__le64     CreationTime;         /*    48     8 */
__le64     LastAccessTime;       /*    56     8 */
/* --- cacheline 1 boundary (64 bytes) --- */
__le64     LastWriteTime;        /*    64     8 */
__le64     ChangeTime;           /*    72     8 */
__le32     FileAttributes;       /*    80     4 */
} common_attributes;                     /*    48    40 */
};                                               /*    48    40 */

...

/* size: 111, cachelines: 2, members: 14 */
/* last cacheline: 47 bytes */
} __attribute__((__packed__));

pahole -C smb_com_open_rsp fs/smb/client/cifssmb.o
struct smb_com_open_rsp {
...

union {
struct {
__le64     CreationTime;         /*    48     8 */
__le64     LastAccessTime;       /*    56     8 */
/* --- cacheline 1 boundary (64 bytes) --- */
__le64     LastWriteTime;        /*    64     8 */
__le64     ChangeTime;           /*    72     8 */
__le32     FileAttributes;       /*    80     4 */
} __attribute__((__packed__));           /*    48    36 */
struct {
__le64     CreationTime;         /*    48     8 */
__le64     LastAccessTime;       /*    56     8 */
/* --- cacheline 1 boundary (64 bytes) --- */
__le64     LastWriteTime;        /*    64     8 */
__le64     ChangeTime;           /*    72     8 */
__le32     FileAttributes;       /*    80     4 */
} __attribute__((__packed__)) common_attributes;       /*    48    36 */
};                                               /*    48    36 */

...

/* size: 107, cachelines: 2, members: 14 */
/* last cacheline: 43 bytes */
} __attribute__((__packed__));

pahole -C FILE_ALL_INFO fs/smb/client/cifssmb.o
typedef struct {
union {
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le32     Attributes;           /*    32     4 */
};                                       /*     0    40 */
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le32     Attributes;           /*    32     4 */
} common_attributes;                     /*     0    40 */
};                                               /*     0    40 */

...

/* size: 113, cachelines: 2, members: 17 */
/* last cacheline: 49 bytes */
} __attribute__((__packed__)) FILE_ALL_INFO;

pahole -C FILE_ALL_INFO fs/smb/client/cifssmb.o
typedef struct {
union {
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le32     Attributes;           /*    32     4 */
} __attribute__((__packed__));           /*     0    36 */
struct {
__le64     CreationTime;         /*     0     8 */
__le64     LastAccessTime;       /*     8     8 */
__le64     LastWriteTime;        /*    16     8 */
__le64     ChangeTime;           /*    24     8 */
__le32     Attributes;           /*    32     4 */
} __attribute__((__packed__)) common_attributes;       /*     0    36 */
};                                               /*     0    36 */

...

/* size: 109, cachelines: 2, members: 17 */
/* last cacheline: 45 bytes */
} __attribute__((__packed__)) FILE_ALL_INFO;

Fixes: 0015eb6e1238 ("smb: client, common: fix fortify warnings")
Cc: stable@vger.kernel.org
Reviewed-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/smb/client/cifspdu.h
fs/smb/client/smb2pdu.h