diff v29→v32 (patch 15) | series

Inter-revision diff: patch 15

Comparing v29 (message) to v32 (message)
--- v29
+++ v32
@@ -37,18 +37,18 @@
  15 files changed, 121 insertions(+), 35 deletions(-)
 
 diff --git a/drivers/android/binder.c b/drivers/android/binder.c
-index d17a34445dcd..36e41b9e08fd 100644
+index 26838061defb..2125b4b795da 100644
 --- a/drivers/android/binder.c
 +++ b/drivers/android/binder.c
-@@ -2461,6 +2461,7 @@ static void binder_transaction(struct binder_proc *proc,
+@@ -2725,6 +2725,7 @@ static void binder_transaction(struct binder_proc *proc,
  	int t_debug_id = atomic_inc_return(&binder_last_id);
  	char *secctx = NULL;
  	u32 secctx_sz = 0;
 +	struct lsmcontext scaff; /* scaffolding */
- 
- 	e = binder_transaction_log_add(&binder_transaction_log);
- 	e->debug_id = t_debug_id;
-@@ -2772,7 +2773,8 @@ static void binder_transaction(struct binder_proc *proc,
+ 	struct list_head sgc_head;
+ 	struct list_head pf_head;
+ 	const void __user *user_buffer = (const void __user *)
+@@ -3033,7 +3034,8 @@ static void binder_transaction(struct binder_proc *proc,
  			t->security_ctx = 0;
  			WARN_ON(1);
  		}
@@ -58,7 +58,7 @@
  		secctx = NULL;
  	}
  	t->buffer->debug_id = t->debug_id;
-@@ -3114,8 +3116,10 @@ static void binder_transaction(struct binder_proc *proc,
+@@ -3433,8 +3435,10 @@ static void binder_transaction(struct binder_proc *proc,
  	binder_alloc_free_buf(&target_proc->alloc, t->buffer);
  err_binder_alloc_buf_failed:
  err_bad_extra_size:
@@ -72,10 +72,10 @@
  	kfree(tcomplete);
  	binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
 diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
-index 159a1ffa4f4b..c61a8432dac5 100644
+index fcf7dfdecf96..df2b3bf46364 100644
 --- a/fs/ceph/xattr.c
 +++ b/fs/ceph/xattr.c
-@@ -1375,12 +1375,16 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,
+@@ -1374,12 +1374,16 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,
  
  void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx)
  {
@@ -94,10 +94,10 @@
  	if (as_ctx->pagelist)
  		ceph_pagelist_release(as_ctx->pagelist);
 diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index e1214bb6b7ee..71004670455b 100644
+index b18f31b2c9e7..c6237b5ddd93 100644
 --- a/fs/nfs/nfs4proc.c
 +++ b/fs/nfs/nfs4proc.c
-@@ -136,8 +136,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,
+@@ -133,8 +133,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,
  static inline void
  nfs4_label_release_security(struct nfs4_label *label)
  {
@@ -113,10 +113,10 @@
  static inline u32 *nfs4_bitmask(struct nfs_server *server, struct nfs4_label *label)
  {
 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 7abeccb975b2..089ec4b61ef1 100644
+index 899de438e529..fedc4b0292d6 100644
 --- a/fs/nfsd/nfs4xdr.c
 +++ b/fs/nfsd/nfs4xdr.c
-@@ -2844,6 +2844,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -2830,6 +2830,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
  	int err;
  	struct nfs4_acl *acl = NULL;
  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
@@ -124,7 +124,7 @@
  	void *context = NULL;
  	int contextlen;
  #endif
-@@ -3345,8 +3346,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -3331,8 +3332,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
  
  out:
  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
@@ -138,10 +138,10 @@
  	kfree(acl);
  	if (tempfh) {
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 58c853eabcc9..580eec268138 100644
+index 735e39fa510d..72da145c1aad 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -134,6 +134,37 @@ enum lockdown_reason {
+@@ -135,6 +135,37 @@ enum lockdown_reason {
  
  extern const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1];
  
@@ -179,7 +179,7 @@
  /*
   * Data exported by the security modules
   *
-@@ -551,7 +582,7 @@ int security_ismaclabel(const char *name);
+@@ -568,7 +599,7 @@ int security_ismaclabel(const char *name);
  int security_secid_to_secctx(struct lsmblob *blob, char **secdata, u32 *seclen);
  int security_secctx_to_secid(const char *secdata, u32 seclen,
  			     struct lsmblob *blob);
@@ -188,7 +188,7 @@
  void security_inode_invalidate_secctx(struct inode *inode);
  int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
  int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
-@@ -1415,7 +1446,7 @@ static inline int security_secctx_to_secid(const char *secdata,
+@@ -1431,7 +1462,7 @@ static inline int security_secctx_to_secid(const char *secdata,
  	return -EOPNOTSUPP;
  }
  
@@ -221,10 +221,10 @@
  	}
  }
 diff --git a/kernel/audit.c b/kernel/audit.c
-index 8ec64e6e8bc0..c17ec23158c4 100644
+index c7cd039e258b..5aa2ee06c9e4 100644
 --- a/kernel/audit.c
 +++ b/kernel/audit.c
-@@ -1192,6 +1192,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -1190,6 +1190,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
  	struct audit_sig_info   *sig_data;
  	char			*ctx = NULL;
  	u32			len;
@@ -232,9 +232,9 @@
  
  	err = audit_netlink_ok(skb, msg_type);
  	if (err)
-@@ -1449,15 +1450,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
- 		}
- 		sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
+@@ -1447,15 +1448,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ 		}
+ 		sig_data = kmalloc(struct_size(sig_data, ctx, len), GFP_KERNEL);
  		if (!sig_data) {
 -			if (lsmblob_is_set(&audit_sig_lsm))
 -				security_release_secctx(ctx, len);
@@ -253,16 +253,16 @@
 +			security_release_secctx(&scaff);
  		}
  		audit_send_reply(skb, seq, AUDIT_SIGNAL_INFO, 0, 0,
- 				 sig_data, sizeof(*sig_data) + len);
-@@ -2132,6 +2136,7 @@ int audit_log_task_context(struct audit_buffer *ab)
+ 				 sig_data, struct_size(sig_data, ctx, len));
+@@ -2147,6 +2151,7 @@ int audit_log_task_context(struct audit_buffer *ab)
  	unsigned len;
  	int error;
  	struct lsmblob blob;
 +	struct lsmcontext scaff; /* scaffolding */
  
- 	security_task_getsecid_subj(current, &blob);
+ 	security_current_getsecid_subj(&blob);
  	if (!lsmblob_is_set(&blob))
-@@ -2145,7 +2150,8 @@ int audit_log_task_context(struct audit_buffer *ab)
+@@ -2161,7 +2166,8 @@ int audit_log_task_context(struct audit_buffer *ab)
  	}
  
  	audit_log_format(ab, " subj=%s", ctx);
@@ -273,10 +273,10 @@
  
  error_path:
 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index b5807b9b8a4d..1b1ddd62de6c 100644
+index c4c3666576c3..1626d8aabe83 100644
 --- a/kernel/auditsc.c
 +++ b/kernel/auditsc.c
-@@ -1002,6 +1002,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+@@ -1121,6 +1121,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
  				 struct lsmblob *blob, char *comm)
  {
  	struct audit_buffer *ab;
@@ -284,7 +284,7 @@
  	char *ctx = NULL;
  	u32 len;
  	int rc = 0;
-@@ -1019,7 +1020,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+@@ -1138,7 +1139,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
  			rc = 1;
  		} else {
  			audit_log_format(ab, " obj=%s", ctx);
@@ -294,7 +294,7 @@
  		}
  	}
  	audit_log_format(ab, " ocomm=");
-@@ -1232,6 +1234,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)
+@@ -1351,6 +1353,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)
  
  static void show_special(struct audit_context *context, int *call_panic)
  {
@@ -302,7 +302,7 @@
  	struct audit_buffer *ab;
  	int i;
  
-@@ -1266,7 +1269,8 @@ static void show_special(struct audit_context *context, int *call_panic)
+@@ -1385,7 +1388,8 @@ static void show_special(struct audit_context *context, int *call_panic)
  				*call_panic = 1;
  			} else {
  				audit_log_format(ab, " obj=%s", ctx);
@@ -312,7 +312,7 @@
  			}
  		}
  		if (context->ipc.has_perm) {
-@@ -1417,6 +1421,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+@@ -1542,6 +1546,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
  		char *ctx = NULL;
  		u32 len;
  		struct lsmblob blob;
@@ -320,7 +320,7 @@
  
  		lsmblob_init(&blob, n->osid);
  		if (security_secid_to_secctx(&blob, &ctx, &len)) {
-@@ -1425,7 +1430,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+@@ -1550,7 +1555,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
  				*call_panic = 2;
  		} else {
  			audit_log_format(ab, " obj=%s", ctx);
@@ -331,7 +331,7 @@
  	}
  
 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
-index cb10b5f03cf4..bf32ab6f81c7 100644
+index 933a8f94f93a..70ca4510ea35 100644
 --- a/net/ipv4/ip_sockglue.c
 +++ b/net/ipv4/ip_sockglue.c
 @@ -130,6 +130,7 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,
@@ -353,7 +353,7 @@
  
  static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb)
 diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
-index daf554915e07..de223234963d 100644
+index 073510c94b56..212e12b53adb 100644
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
 @@ -342,6 +342,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
@@ -375,7 +375,7 @@
  }
  #else
 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index 79c280d1efce..3fcf44342b14 100644
+index bba3a66f5636..3b6ba86783f6 100644
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
 @@ -179,6 +179,7 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
@@ -397,18 +397,18 @@
  #else
  static inline void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
 diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
-index bb97e8af8345..3603bd938b74 100644
+index a9f7c9418ad3..d986bae1587b 100644
 --- a/net/netfilter/nfnetlink_queue.c
 +++ b/net/netfilter/nfnetlink_queue.c
 @@ -397,6 +397,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
- 	enum ip_conntrack_info ctinfo;
- 	struct nfnl_ct_hook *nfnl_ct;
+ 	enum ip_conntrack_info ctinfo = 0;
+ 	const struct nfnl_ct_hook *nfnl_ct;
  	bool csum_verify;
 +	struct lsmcontext scaff; /* scaffolding */
  	char *secdata = NULL;
  	u32 seclen = 0;
  
-@@ -626,8 +627,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+@@ -627,8 +628,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
  	}
  
  	nlh->nlmsg_len = skb->len;
@@ -421,7 +421,7 @@
  	return skb;
  
  nla_put_failure:
-@@ -635,8 +638,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+@@ -636,8 +639,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
  	kfree_skb(skb);
  	net_err_ratelimited("nf_queue: error creating packet message\n");
  nlmsg_failure:
@@ -435,7 +435,7 @@
  }
  
 diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
-index 15b53fc4e83f..7cb6f27c8cb2 100644
+index c86df6ead742..a8e9ee202245 100644
 --- a/net/netlabel/netlabel_unlabeled.c
 +++ b/net/netlabel/netlabel_unlabeled.c
 @@ -374,6 +374,7 @@ int netlbl_unlhsh_add(struct net *net,
@@ -536,10 +536,10 @@
  
  	return audit_buf;
 diff --git a/security/security.c b/security/security.c
-index 863d6f77df2e..e9a56d44ab6e 100644
+index 0bca482166d8..163cf0ae2429 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2362,16 +2362,17 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
+@@ -2366,16 +2366,17 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
  }
  EXPORT_SYMBOL(security_secctx_to_secid);
`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help