diff options
| author | Fedor Pchelkin <pchelkin@ispras.ru> | 2026-08-31 10:58:09 +0300 |
|---|---|---|
| committer | Mika Westerberg <mika.westerberg@linux.intel.com> | 2026-09-02 09:07:46 +0200 |
| commit | 4310c6b8e75d6a47f7548e5948fbe6318aa4440a (patch) | |
| tree | 0032b584d8e218681a48126eb91f57091c351b83 /usr/dummy-include | |
| download | linux-stable-4310c6b8e75d6a47f7548e5948fbe6318aa4440a.tar.gz linux-stable-4310c6b8e75d6a47f7548e5948fbe6318aa4440a.zip | |
thunderbolt: Fix NULL dereference in tb_remove_work()grafted
There is a slight race between tb_remove_work() and tb_domain_remove()
which leads to dereferencing a NULL tb->root_switch pointer inside
tb_free_unplugged_xdomains():
Thread A Thread B
tb_remove_work()
tb_domain_remove()
mutex_lock(&tb->lock)
tb_stop()
/* doesn't cancel a running callback */
cancel_delayed_work(&tcm->remove_work)
...
tb_switch_remove(tb->root_switch)
tb->root_switch = NULL
mutex_unlock(&tb->lock)
mutex_lock(&tb->lock)
...
/* without checking ->root_switch */
tb_free_unplugged_xdomains(tb->root_switch)
mutex_unlock(&tb->lock)
Commit a8937f35cf39 ("thunderbolt: Remove XDomain from the bus without
holding tb->lock") doesn't seem right to move tb_free_unplugged_xdomains()
out of the &tb->lock section and the check for tb->root_switch, in
particular. It states:
For this reason separate removing the XDomain from the topology data
structures (where we need the lock) from unregistering the device from
the bus (where remove callbacks of the drivers are being called).
tb_free_unplugged_xdomains() belongs to the former group of functions
requiring the lock. And it also calls tb_xdomain_remove() which should
only be called with &tb->lock held.
Found by Linux Verification Center (linuxtesting.org) with Svace static
analysis tool.
Fixes: a8937f35cf39 ("thunderbolt: Remove XDomain from the bus without holding tb->lock")
Cc: stable@vger.kernel.org
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'usr/dummy-include')
| -rw-r--r-- | usr/dummy-include/endian.h | 0 | ||||
| -rw-r--r-- | usr/dummy-include/limits.h | 8 | ||||
| -rw-r--r-- | usr/dummy-include/netinet/if_ether.h | 0 | ||||
| -rw-r--r-- | usr/dummy-include/netinet/in.h | 0 | ||||
| -rw-r--r-- | usr/dummy-include/stddef.h | 13 | ||||
| -rw-r--r-- | usr/dummy-include/stdint.h | 17 | ||||
| -rw-r--r-- | usr/dummy-include/string.h | 12 | ||||
| -rw-r--r-- | usr/dummy-include/sys/ioctl.h | 0 | ||||
| -rw-r--r-- | usr/dummy-include/sys/socket.h | 12 | ||||
| -rw-r--r-- | usr/dummy-include/sys/time.h | 3 | ||||
| -rw-r--r-- | usr/dummy-include/sys/types.h | 0 | ||||
| -rw-r--r-- | usr/dummy-include/time.h | 0 | ||||
| -rw-r--r-- | usr/dummy-include/unistd.h | 0 |
13 files changed, 65 insertions, 0 deletions
diff --git a/usr/dummy-include/endian.h b/usr/dummy-include/endian.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/endian.h diff --git a/usr/dummy-include/limits.h b/usr/dummy-include/limits.h new file mode 100644 index 000000000..49b17c10c --- /dev/null +++ b/usr/dummy-include/limits.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _DUMMY_LIMITS_H +#define _DUMMY_LIMITS_H + +#define INT_MAX ((int)(~0U >> 1)) +#define INT_MIN (-INT_MAX - 1) + +#endif /* _DUMMY_LIMITS_H */ diff --git a/usr/dummy-include/netinet/if_ether.h b/usr/dummy-include/netinet/if_ether.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/netinet/if_ether.h diff --git a/usr/dummy-include/netinet/in.h b/usr/dummy-include/netinet/in.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/netinet/in.h diff --git a/usr/dummy-include/stddef.h b/usr/dummy-include/stddef.h new file mode 100644 index 000000000..525489daf --- /dev/null +++ b/usr/dummy-include/stddef.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _DUMMY_STDDEF_H +#define _DUMMY_STDDEF_H + +#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER) + +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif + +#endif /* _DUMMY_STDDEF_H */ diff --git a/usr/dummy-include/stdint.h b/usr/dummy-include/stdint.h new file mode 100644 index 000000000..93b1962fd --- /dev/null +++ b/usr/dummy-include/stdint.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _DUMMY_STDINT_H +#define _DUMMY_STDINT_H + +#include <linux/types.h> + +typedef __u64 uint64_t; +typedef __u32 uint32_t; +typedef __u16 uint16_t; +typedef __u8 uint8_t; + +typedef __s64 int64_t; +typedef __s32 int32_t; +typedef __s16 int16_t; +typedef __s8 int8_t; + +#endif /* _DUMMY_STDINT_H */ diff --git a/usr/dummy-include/string.h b/usr/dummy-include/string.h new file mode 100644 index 000000000..e059808d3 --- /dev/null +++ b/usr/dummy-include/string.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _DUMMY_STRING_H +#define _DUMMY_STRING_H + +#include <stddef.h> + +#define memset(_s, _c, _n) __builtin_memset(_s, _c, _n) +#define memcpy(_dest, _src, _n) __builtin_memcpy(_dest, _src, _n) + +#define strlen(_s) __builtin_strlen(_s) + +#endif /* _DUMMY_STRING_H */ diff --git a/usr/dummy-include/sys/ioctl.h b/usr/dummy-include/sys/ioctl.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/sys/ioctl.h diff --git a/usr/dummy-include/sys/socket.h b/usr/dummy-include/sys/socket.h new file mode 100644 index 000000000..748751f9e --- /dev/null +++ b/usr/dummy-include/sys/socket.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _DUMMY_SYS_SOCKET_H +#define _DUMMY_SYS_SOCKET_H + +#include <linux/socket.h> + +struct sockaddr { + __kernel_sa_family_t sa_family; /* address family, AF_xxx */ + char sa_data[14]; /* 14 bytes of protocol address */ +}; + +#endif /* _DUMMY_SYS_SOCKET_H */ diff --git a/usr/dummy-include/sys/time.h b/usr/dummy-include/sys/time.h new file mode 100644 index 000000000..9817b8afb --- /dev/null +++ b/usr/dummy-include/sys/time.h @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <linux/time.h> diff --git a/usr/dummy-include/sys/types.h b/usr/dummy-include/sys/types.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/sys/types.h diff --git a/usr/dummy-include/time.h b/usr/dummy-include/time.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/time.h diff --git a/usr/dummy-include/unistd.h b/usr/dummy-include/unistd.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/usr/dummy-include/unistd.h |
