Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeda4ac3 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

parents d2e7ad19 350e4f31

include/linux/flex_array.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void *flex_array_get(struct flex_array *fa, unsigned int element_nr); 
int flex_array_shrink(struct flex_array *fa);



#define flex_array_put_ptr(fa, nr, src, gfp) \

	flex_array_put(fa, nr, &(void *)(src), gfp)

	flex_array_put(fa, nr, (void *)&(src), gfp)



void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr);

security/selinux/hooks.c

+4 −1
Original line number Diff line number Diff line
@@ -2525,7 +2525,10 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, 
	sid = tsec->sid;

	newsid = tsec->create_sid;



	if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) {

	if ((sbsec->flags & SE_SBINITIALIZED) &&

	    (sbsec->behavior == SECURITY_FS_USE_MNTPOINT))

		newsid = sbsec->mntpoint_sid;

	else if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) {

		rc = security_transition_sid(sid, dsec->sid,

					     inode_mode_to_security_class(inode->i_mode),

					     &newsid);

security/selinux/nlmsgtab.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ static struct nlmsg_perm nlmsg_route_perms[] = 
	{ RTM_NEWADDRLABEL,	NETLINK_ROUTE_SOCKET__NLMSG_WRITE },

	{ RTM_DELADDRLABEL,	NETLINK_ROUTE_SOCKET__NLMSG_WRITE },

	{ RTM_GETADDRLABEL,	NETLINK_ROUTE_SOCKET__NLMSG_READ  },

	{ RTM_GETDCB,		NETLINK_ROUTE_SOCKET__NLMSG_READ  },

	{ RTM_SETDCB,		NETLINK_ROUTE_SOCKET__NLMSG_WRITE },

};



static struct nlmsg_perm nlmsg_firewall_perms[] =

security/selinux/selinuxfs.c

+311 −338

File changed.

Preview size limit exceeded, changes collapsed.

security/selinux/ss/conditional.c

+5 −1

File changed.

Preview size limit exceeded, changes collapsed.