selinux/stable-6.16 PR 20250618

-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEES0KozwfymdVUl37v6iDy2pc3iXMFAmhS6WAUHHBhdWxAcGF1
 bC1tb29yZS5jb20ACgkQ6iDy2pc3iXO4SxAAq46cqsQ7sx6OEe699Xjl+/J6qcZ9
 W4+dnV0f82dR9xzTlHPBgD5TjDOVvorUSHnRPla6CDgsf+/Yg2nmGQ1c/TU9/uFw
 Tgy8GLaGXPaQYxQnbCgT3X3oF6fC8swYDU8a1L+siuggNXBUmliwrd9UDs7uGDWf
 lD2WSKJGzkLjY56EodEZ7kvpiKe8cQX2WI91l4lCk7vxFpgpUr0OEKTOoPucJjJa
 8pzbQxZTOWf2VIPdYBIyfUYfRRFPWuK6yYGgpgjHOpLVRqmug0s8HudEKGl1AFvq
 vjOF+dhWOcNwG9x729ZwPdOjPGstSs0sjczs/L74tCoJeLoVqo3CKeBo17Kn/ZvP
 Lqji1dSZv/F8hiIXxj5uWB9emYaTBKIZiN8fcbCB8KeJSwkukMYb6z5Jtuooe+c5
 ZHppePXBDCk7yR/EUyYt4oLR+YrtLfvQ3HOdM3bzN3ng05iUYVXz7pyooeZFYIq7
 6k+Zm7wfAba4Jn3aJbaYxj6NZbVQFCYavavxoBUgrKBkppfh+g8OHAS5vtLPoXkR
 vI5RMKi/ZbagXpH1LAaCpDdrRfrt3W3a85GRvsJLGc1iazP1GGQ3R4ZHATdIihpZ
 G+b11ufwfGnXjFIqzSv8Ccic1txBJrKvreUGnd3YEXaFqMapQ5JAkJ1bVbD7g+nF
 rpQ9cNw33Vlttm4=
 =HE5Y
 -----END PGP SIGNATURE-----

Merge tag 'selinux-pr-20250618' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull selinux fix from Paul Moore:
 "A small SELinux patch to resolve a UBSAN warning in the
  xfrm/labeled-IPsec code"

* tag 'selinux-pr-20250618' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: fix selinux_xfrm_alloc_user() to set correct ctx_len
This commit is contained in:
Linus Torvalds 2025-06-18 10:32:01 -07:00
commit 5adb635077

View File

@ -94,7 +94,7 @@ static int selinux_xfrm_alloc_user(struct xfrm_sec_ctx **ctxp,
ctx->ctx_doi = XFRM_SC_DOI_LSM;
ctx->ctx_alg = XFRM_SC_ALG_SELINUX;
ctx->ctx_len = str_len;
ctx->ctx_len = str_len + 1;
memcpy(ctx->ctx_str, &uctx[1], str_len);
ctx->ctx_str[str_len] = '\0';
rc = security_context_to_sid(ctx->ctx_str, str_len,