UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

selinux/stable-5.18 PR 20220518 

-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEES0KozwfymdVUl37v6iDy2pc3iXMFAmKFMdEUHHBhdWxAcGF1
 bC1tb29yZS5jb20ACgkQ6iDy2pc3iXOdehAAj2o4/c45n8R5VJK6e7Ft60J1arE4
 rueclzHcBzcdJ2gVhFYeNO3sPitqaOvO5t3WRPbzIuwswOFdMPETeI5MyziGceLX
 eIqyu77cLHvp+9vLxoK4b+lwR8RJOEl3GAdmQ3jFWk4wd9UjpXuxgrTh7mR8QeWB
 VHC9CphZtEmlL2TUEhTiD0iU1VLazQkNm3PEw7ydNZiGlnSLfkDzuxaIrktncgRn
 J7HivBkNj1LKj7CK8M0bNN0KEfzcw8FOD25tWO54kHx/tZ/ey33JxmamX6QKcpkL
 tRb1rK14bSPPkTFrAbKv1JpfzAcq0g5MtS9HqWVucCF9iPmWHOleX3BQCyVtd3mv
 F1G46EeMLCiBTVS3j/P7n+dlGyy2Z0YOTZBM1el8aN+m1mX+WMLe+TG3/0eOEVHj
 +zvf9K1rxzsptq5ris+NjsHj/afiGr2fBKQL2C/DvYS1s0h/aRr04eUY1CqgHguw
 r8VMm+kqQdk+0XXrdnpynv0PKF5nqNdvK1omESoy96WsBG0p6uZt9xE3ldNoliFl
 pjerJaozqqd/rf1b+xUdtrX/nx1eqCLGt29BfPyGWM/wCZSR+kbGRKEhDtci9xIx
 kTBy6b/5UmP8JIC8sFHhFaRRaoGVq8Okx6agAxltMXu9eAsWJuN93hU3fGt3Dwki
 SnuC2Q+oqr015KY=
 =pG2a
 -----END PGP SIGNATURE-----

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

Pull selinux fix from Paul Moore:
 "A single SELinux patch to fix an error path that was doing the wrong
  thing with respect to freeing memory"

* tag 'selinux-pr-20220518' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: fix bad cleanup on error in hashtab_duplicate()
This commit is contained in:
Linus Torvalds 2022-05-18 14:15:35 -10:00
parent 5494d0eb43 6254bd3db3
commit 6899c16131
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/selinux/ss/hashtab.c
View File

@ -179,7 +179,8 @@ int hashtab_duplicate(struct hashtab *new, struct hashtab *orig,
kmem_cache_free(hashtab_node_cachep, cur);
}
}
kmem_cache_free(hashtab_node_cachep, new);
kfree(new->htable);
memset(new, 0, sizeof(*new));
return -ENOMEM;
}