diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.co.jp> | 2021-11-24 11:14:19 +0900 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-11-26 18:01:53 -0800 |
| commit | 755662ce78d14c1a9118df921c528b1f992ded2e (patch) | |
| tree | 7932aff19cff0e8f89785ba434c9b4f95a3efb19 /net/unix/diag.c | |
| parent | 442b03c32ca1077c75682346a1434eedcdc3e4d4 (diff) | |
af_unix: Use offsetof() instead of sizeof().
The length of the AF_UNIX socket address contains an offset to the member
sun_path of struct sockaddr_un.
Currently, the preceding member is just sun_family, and its type is
sa_family_t and resolved to short. Therefore, the offset is represented by
sizeof(short). However, it is not clear and fragile to changes in struct
sockaddr_storage or sockaddr_un.
This commit makes it clear and robust by rewriting sizeof() with
offsetof().
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index 7e7d7f45685a..db555f267407 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -19,7 +19,8 @@ static int sk_diag_dump_name(struct sock *sk, struct sk_buff *nlskb) if (!addr) return 0; - return nla_put(nlskb, UNIX_DIAG_NAME, addr->len - sizeof(short), + return nla_put(nlskb, UNIX_DIAG_NAME, + addr->len - offsetof(struct sockaddr_un, sun_path), addr->name->sun_path); } |