diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-14 20:52:25 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-14 20:53:19 +0300 |
| commit | 654de42f3fc6edc29d743c1dbcd1424f7793f63d (patch) | |
| tree | 926a117748f1789c60a9404e14da451975c21a69 /security/selinux/netlabel.c | |
| parent | dc9dfd8ae4b5ac28e457a830556b53b15f4b9a1c (diff) | |
| parent | aea27a92a41dae14843f92c79e9e42d8f570105c (diff) | |
| download | linux-654de42f3fc6edc29d743c1dbcd1424f7793f63d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.10 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'security/selinux/netlabel.c')
| -rw-r--r-- | security/selinux/netlabel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index 8f182800e412..55885634e880 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c @@ -402,7 +402,10 @@ int selinux_netlbl_socket_post_create(struct sock *sk, u16 family) secattr = selinux_netlbl_sock_genattr(sk); if (secattr == NULL) return -ENOMEM; - rc = netlbl_sock_setattr(sk, family, secattr); + /* On socket creation, replacement of IP options is safe even if + * the caller does not hold the socket lock. + */ + rc = netlbl_sock_setattr(sk, family, secattr, true); switch (rc) { case 0: sksec->nlbl_state = NLBL_LABELED; |