--- v26
+++ v27
@@ -192,7 +192,7 @@
  	if (args[size - 1] != '\0') {
  		/* null terminate */
 diff --git a/security/security.c b/security/security.c
-index f5407a85641e..1ce125c01782 100644
+index c2a5c50e913b..fe18c8d8bc22 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -77,7 +77,16 @@ static struct kmem_cache *lsm_file_cache;
@@ -213,7 +213,7 @@
  
  /* Boot-time LSM user choice */
  static __initdata const char *chosen_lsm_order;
-@@ -669,6 +678,8 @@ int lsm_inode_alloc(struct inode *inode)
+@@ -671,6 +680,8 @@ int lsm_inode_alloc(struct inode *inode)
   */
  static int lsm_task_alloc(struct task_struct *task)
  {
@@ -222,7 +222,7 @@
  	if (blob_sizes.lbs_task == 0) {
  		task->security = NULL;
  		return 0;
-@@ -677,6 +688,15 @@ static int lsm_task_alloc(struct task_struct *task)
+@@ -679,6 +690,15 @@ static int lsm_task_alloc(struct task_struct *task)
  	task->security = kzalloc(blob_sizes.lbs_task, GFP_KERNEL);
  	if (task->security == NULL)
  		return -ENOMEM;
@@ -238,7 +238,7 @@
  	return 0;
  }
  
-@@ -1732,14 +1752,26 @@ int security_file_open(struct file *file)
+@@ -1734,14 +1754,26 @@ int security_file_open(struct file *file)
  
  int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
  {
@@ -268,7 +268,7 @@
  }
  
  void security_task_free(struct task_struct *task)
-@@ -2171,23 +2203,110 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name,
+@@ -2173,23 +2205,110 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name,
  				char **value)
  {
  	struct security_hook_list *hp;
@@ -379,7 +379,7 @@
  		return hp->hook.setprocattr(name, value, size);
  	}
  	return LSM_RET_DEFAULT(setprocattr);
-@@ -2207,15 +2326,15 @@ EXPORT_SYMBOL(security_ismaclabel);
+@@ -2209,15 +2328,15 @@ EXPORT_SYMBOL(security_ismaclabel);
  int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen)
  {
  	struct security_hook_list *hp;
@@ -400,7 +400,7 @@
  	}
  
  	return LSM_RET_DEFAULT(secid_to_secctx);
-@@ -2226,16 +2345,15 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
+@@ -2228,16 +2347,15 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
  			     struct lsmblob *blob)
  {
  	struct security_hook_list *hp;
@@ -421,7 +421,7 @@
  	}
  	return 0;
  }
-@@ -2243,7 +2361,14 @@ EXPORT_SYMBOL(security_secctx_to_secid);
+@@ -2245,7 +2363,14 @@ EXPORT_SYMBOL(security_secctx_to_secid);
  
  void security_release_secctx(char *secdata, u32 seclen)
  {
@@ -437,7 +437,7 @@
  }
  EXPORT_SYMBOL(security_release_secctx);
  
-@@ -2384,8 +2509,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);
+@@ -2386,8 +2511,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);
  int security_socket_getpeersec_stream(struct socket *sock, char __user *optval,
  				      int __user *optlen, unsigned len)
  {