diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-07-28 18:38:34 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-28 13:43:40 -0700 |
| commit | 035bfd051eae5b365368be915dfaf916aa501a52 (patch) | |
| tree | b943278a8688f27ae44d0e6e18d6fcde385afaa9 | |
| parent | netfilter: arp_tables: restore a SPDX identifier (diff) | |
| download | wireguard-linux-035bfd051eae5b365368be915dfaf916aa501a52.tar.xz wireguard-linux-035bfd051eae5b365368be915dfaf916aa501a52.zip | |
net: make sockptr_is_null strict aliasing safe
While the kernel in general is not strict aliasing safe we can trivially
do that in sockptr_is_null without affecting code generation, so always
check the actually assigned union member.
Reported-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/sockptr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sockptr.h b/include/linux/sockptr.h index 7d5cdb2b30b5..b13ea1422f93 100644 --- a/include/linux/sockptr.h +++ b/include/linux/sockptr.h @@ -64,7 +64,9 @@ static inline int __must_check init_user_sockptr(sockptr_t *sp, void __user *p) static inline bool sockptr_is_null(sockptr_t sockptr) { - return !sockptr.user && !sockptr.kernel; + if (sockptr_is_kernel(sockptr)) + return !sockptr.kernel; + return !sockptr.user; } static inline int copy_from_sockptr(void *dst, sockptr_t src, size_t size) |