mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
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>
This commit is contained in:
parent
a3ad434ad7
commit
035bfd051e
1 changed files with 3 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue