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

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

Merge branch 'next-queue' into next

parents eaa5eec7 634a539e

security/keys/keyring.c

+2 −4
Original line number Diff line number Diff line
@@ -170,12 +170,10 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m) 
{

	struct keyring_list *klist;



	if (keyring->description) {

	if (keyring->description)

		seq_puts(m, keyring->description);

	}

	else {

	else

		seq_puts(m, "[anon]");

	}



	rcu_read_lock();

	klist = rcu_dereference(keyring->payload.subscriptions);

security/security.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int __init security_module_enable(struct security_operations *ops) 
 * If there is already a security module registered with the kernel,

 * an error will be returned.  Otherwise %0 is returned on success.

 */

int register_security(struct security_operations *ops)

int __init register_security(struct security_operations *ops)

{

	if (verify(ops)) {

		printk(KERN_DEBUG "%s could not verify "

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ extern int ss_initialized; 


/* The file system's label must be initialized prior to use. */



static char *labeling_behaviors[6] = {

static const char *labeling_behaviors[6] = {

	"uses xattr",

	"uses transition SIDs",

	"uses task SIDs",

security/selinux/include/initial_sid_to_string.h

+1 −1
Original line number Diff line number Diff line 
/* This file is automatically generated.  Do not edit. */

static char *initial_sid_to_string[] =

static const char *initial_sid_to_string[] =

{

    "null",

    "kernel",

security/selinux/netlink.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/types.h>

#include <linux/stddef.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/skbuff.h>

#include <linux/netlink.h>

#include <linux/selinux_netlink.h>