Commit 5d9f4cf3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SELinux fix from Paul Moore:
 "A fix to make sure things are handled correctly when an allocation
  fails"

* tag 'selinux-pr-20211123' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: fix NULL-pointer dereference when hashtab allocation fails
parents b7359362 dc27f3c5

security/selinux/ss/hashtab.c

+12 −5
Original line number Diff line number Diff line
@@ -31,13 +31,20 @@ static u32 hashtab_compute_size(u32 nel) 


int hashtab_init(struct hashtab *h, u32 nel_hint)

{

	h->size = hashtab_compute_size(nel_hint);

	u32 size = hashtab_compute_size(nel_hint);



	/* should already be zeroed, but better be safe */

	h->nel = 0;

	if (!h->size)

		return 0;

	h->size = 0;

	h->htable = NULL;



	h->htable = kcalloc(h->size, sizeof(*h->htable), GFP_KERNEL);

	return h->htable ? 0 : -ENOMEM;

	if (size) {

		h->htable = kcalloc(size, sizeof(*h->htable), GFP_KERNEL);

		if (!h->htable)

			return -ENOMEM;

		h->size = size;

	}

	return 0;

}



int __hashtab_insert(struct hashtab *h, struct hashtab_node **dst,