--- v29
+++ v28
@@ -21,10 +21,10 @@
  6 files changed, 85 insertions(+), 25 deletions(-)
 
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 399b83ad1a43..e2ca097b58db 100644
+index 332df8a1cd4d..986a8f4bcd54 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -197,6 +197,27 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb)
+@@ -196,6 +196,27 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb)
  extern int lsm_name_to_slot(char *name);
  extern const char *lsm_slot_to_name(int slot);
  
@@ -52,7 +52,7 @@
  /* These functions are in security/commoncap.c */
  extern int cap_capable(const struct cred *cred, struct user_namespace *ns,
  		       int cap, unsigned int opts);
-@@ -528,7 +549,8 @@ int security_setprocattr(const char *lsm, const char *name, void *value,
+@@ -527,7 +548,8 @@ int security_setprocattr(const char *lsm, const char *name, void *value,
  int security_netlink_send(struct sock *sk, struct sk_buff *skb);
  int security_ismaclabel(const char *name);
  int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);
@@ -62,7 +62,7 @@
  void security_release_secctx(char *secdata, u32 seclen);
  void security_inode_invalidate_secctx(struct inode *inode);
  int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
-@@ -1383,7 +1405,7 @@ static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *secle
+@@ -1382,7 +1404,7 @@ static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *secle
  
  static inline int security_secctx_to_secid(const char *secdata,
  					   u32 seclen,
@@ -72,7 +72,7 @@
  	return -EOPNOTSUPP;
  }
 diff --git a/kernel/cred.c b/kernel/cred.c
-index d82fd1236537..2f9ade2ffb20 100644
+index ea36ec6e1ad8..38b00a1390f4 100644
 --- a/kernel/cred.c
 +++ b/kernel/cred.c
 @@ -798,14 +798,12 @@ EXPORT_SYMBOL(set_security_override);
@@ -154,10 +154,10 @@
  		pr_info_ratelimited("unable to map security context \'%s\'\n",
  				    info->secctx);
 diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
-index 566ba4397ee4..762561318d78 100644
+index 2483df0bbd7c..c29a8d7a7070 100644
 --- a/net/netlabel/netlabel_unlabeled.c
 +++ b/net/netlabel/netlabel_unlabeled.c
-@@ -880,7 +880,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
+@@ -882,7 +882,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
  	void *addr;
  	void *mask;
  	u32 addr_len;
@@ -166,7 +166,7 @@
  	struct netlbl_audit audit_info;
  
  	/* Don't allow users to add both IPv4 and IPv6 addresses for a
-@@ -904,13 +904,18 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
+@@ -906,13 +906,18 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
  	ret_val = security_secctx_to_secid(
  		                  nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]),
  				  nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]),
@@ -188,7 +188,7 @@
  }
  
  /**
-@@ -931,7 +936,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
+@@ -933,7 +938,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
  	void *addr;
  	void *mask;
  	u32 addr_len;
@@ -197,7 +197,7 @@
  	struct netlbl_audit audit_info;
  
  	/* Don't allow users to add both IPv4 and IPv6 addresses for a
-@@ -953,13 +958,15 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
+@@ -955,13 +960,15 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
  	ret_val = security_secctx_to_secid(
  		                  nla_data(info->attrs[NLBL_UNLABEL_A_SECCTX]),
  				  nla_len(info->attrs[NLBL_UNLABEL_A_SECCTX]),
@@ -217,10 +217,10 @@
  
  /**
 diff --git a/security/security.c b/security/security.c
-index a049b82d58e1..520fa287c90c 100644
+index 69474918be8b..1621a28bf9c4 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2194,10 +2194,22 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
+@@ -2193,10 +2193,22 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
  }
  EXPORT_SYMBOL(security_secid_to_secctx);
  
@@ -246,7 +246,7 @@
  }
  EXPORT_SYMBOL(security_secctx_to_secid);
  
-@@ -2348,10 +2360,26 @@ int security_socket_getpeersec_stream(struct socket *sock, char __user *optval,
+@@ -2347,10 +2359,26 @@ int security_socket_getpeersec_stream(struct socket *sock, char __user *optval,
  				optval, optlen, len);
  }