Commit 1e484d38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-v5.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull security layer fix from James  Morris:
 "A device_cgroup RCU warning fix from Amol Grover"

* tag 'fixes-v5.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  device_cgroup: Fix RCU list debugging warning
parents 00acc505 bc62d68e

security/device_cgroup.c

+2 −1
Original line number Diff line number Diff line
@@ -354,7 +354,8 @@ static bool match_exception_partial(struct list_head *exceptions, short type, 
{

	struct dev_exception_item *ex;



	list_for_each_entry_rcu(ex, exceptions, list) {

	list_for_each_entry_rcu(ex, exceptions, list,

				lockdep_is_held(&devcgroup_mutex)) {

		if ((type & DEVCG_DEV_BLOCK) && !(ex->type & DEVCG_DEV_BLOCK))

			continue;

		if ((type & DEVCG_DEV_CHAR) && !(ex->type & DEVCG_DEV_CHAR))