android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/smc: use __aligned_u64 for 64-bit smc_diag fields

Browse Source 
Commit 4b1b7d3b30a6 ("net/smc: add SMC-D diag support") introduced
new UAPI-exposed structure, struct smcd_diag_dmbinfo.  However,
it's not usable by compat binaries, as it has different layout there.
Probably, the most straightforward fix that will avoid similar issues
in the future is to use __aligned_u64 for 64-bit fields.

Fixes: 4b1b7d3b30a6 ("net/smc: add SMC-D diag support")
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eugene Syromiatnikov
2018-10-07 16:57:31 +02:00
committed by David S. Miller
parent 6d4c407744
commit a21048c8ec
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/uapi/linux/smc_diag.h
View File

@ -18,14 +18,14 @@ struct smc_diag_req {
* on the internal clcsock, and more SMC-related socket data * on the internal clcsock, and more SMC-related socket data
*/ */
struct smc_diag_msg { struct smc_diag_msg {
__u8 diag_family; __u8 diag_family;
__u8 diag_state; __u8 diag_state;
__u8 diag_mode; __u8 diag_mode;
__u8 diag_shutdown; __u8 diag_shutdown;
struct inet_diag_sockid id; struct inet_diag_sockid id;
__u32 diag_uid; __u32 diag_uid;
__u64 diag_inode; __aligned_u64 diag_inode;
}; };
/* Mode of a connection */ /* Mode of a connection */
@ -99,11 +99,11 @@ struct smc_diag_fallback {
}; };
struct smcd_diag_dmbinfo { /* SMC-D Socket internals */ struct smcd_diag_dmbinfo { /* SMC-D Socket internals */
__u32 linkid; /* Link identifier */ __u32 linkid; /* Link identifier */
__u64 peer_gid; /* Peer GID */ __aligned_u64 peer_gid; /* Peer GID */
__u64 my_gid; /* My GID */ __aligned_u64 my_gid; /* My GID */
__u64 token; /* Token of DMB */ __aligned_u64 token; /* Token of DMB */
__u64 peer_token; /* Token of remote DMBE */ __aligned_u64 peer_token; /* Token of remote DMBE */
}; };
#endif /* _UAPI_SMC_DIAG_H_ */ #endif /* _UAPI_SMC_DIAG_H_ */