Commit 1b5fb415 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'safesetid-bugfix-5.4' of git://github.com/micah-morton/linux

Pull SafeSetID fix from Micah Morton:
 "Jann Horn sent some patches to fix some bugs in SafeSetID for 5.3.
  After he had done his testing there were a couple small code tweaks
  that went in and caused this bug.

  From what I can see SafeSetID is broken in 5.3 and crashes the kernel
  every time during initialization if you try to use it. I came across
  this bug when backporting Jann's changes for 5.3 to older kernels
  (4.14 and 4.19). I've tested on a Chrome OS device with those kernels
  and verified that this change fixes things.

  It doesn't seem super useful to have this bake in linux-next, since it
  is completely broken in 5.3 and nobody noticed"

* tag 'safesetid-bugfix-5.4' of git://github.com/micah-morton/linux:
  LSM: SafeSetID: Stop releasing uninitialized ruleset
parents 5825a95f 21ab8580
...@@ -187,6 +187,7 @@ static ssize_t handle_policy_update(struct file *file, ...@@ -187,6 +187,7 @@ static ssize_t handle_policy_update(struct file *file,
out_free_buf: out_free_buf:
kfree(buf); kfree(buf);
out_free_pol: out_free_pol:
if (pol)
release_ruleset(pol); release_ruleset(pol);
return err; return err;
} }
......
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