Commit e4311f7c authored by Linus Torvalds's avatar Linus Torvalds

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

Pull selinux fix from Paul Moore:
 "A small fix for a potential problem when cleaning up after a failed
  SELinux policy load (list next pointer not being properly initialized
  to NULL early enough)"

* tag 'selinux-pr-20230821' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: set next pointer before attaching to list
parents f7757129 70d91dc9
...@@ -2005,6 +2005,7 @@ static int filename_trans_read_helper(struct policydb *p, void *fp) ...@@ -2005,6 +2005,7 @@ static int filename_trans_read_helper(struct policydb *p, void *fp)
if (!datum) if (!datum)
goto out; goto out;
datum->next = NULL;
*dst = datum; *dst = datum;
/* ebitmap_read() will at least init the bitmap */ /* ebitmap_read() will at least init the bitmap */
...@@ -2017,7 +2018,6 @@ static int filename_trans_read_helper(struct policydb *p, void *fp) ...@@ -2017,7 +2018,6 @@ static int filename_trans_read_helper(struct policydb *p, void *fp)
goto out; goto out;
datum->otype = le32_to_cpu(buf[0]); datum->otype = le32_to_cpu(buf[0]);
datum->next = NULL;
dst = &datum->next; dst = &datum->next;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment