diff v35→v31 (patch 15) | series

Inter-revision diff: patch 15

Comparing v35 (message) to v31 (message)
--- v35
+++ v31
@@ -37,18 +37,18 @@
  15 files changed, 121 insertions(+), 35 deletions(-)
 
 diff --git a/drivers/android/binder.c b/drivers/android/binder.c
-index 26838061defb..2125b4b795da 100644
+index 27b53e5f71a1..32dca5b40e8a 100644
 --- a/drivers/android/binder.c
 +++ b/drivers/android/binder.c
-@@ -2725,6 +2725,7 @@ static void binder_transaction(struct binder_proc *proc,
+@@ -2469,6 +2469,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 */
- 	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,
+ 
+ 	e = binder_transaction_log_add(&binder_transaction_log);
+ 	e->debug_id = t_debug_id;
+@@ -2771,7 +2772,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;
-@@ -3433,8 +3435,10 @@ static void binder_transaction(struct binder_proc *proc,
+@@ -3112,8 +3114,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 afec84088471..8ac30a5c05ef 100644
+index fcf7dfdecf96..df2b3bf46364 100644
 --- a/fs/ceph/xattr.c
 +++ b/fs/ceph/xattr.c
-@@ -1383,12 +1383,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 16106f805ffa..dc8bdcdd2d2a 100644
+index ee3bc79f6ca3..194bb09663e0 100644
 --- a/fs/nfs/nfs4proc.c
 +++ b/fs/nfs/nfs4proc.c
-@@ -133,8 +133,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,
+@@ -137,8 +137,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 da92e7d2ab6a..77388b5ece56 100644
+index 5a93a5db4fb0..f96da9ac116a 100644
 --- a/fs/nfsd/nfs4xdr.c
 +++ b/fs/nfsd/nfs4xdr.c
-@@ -2830,6 +2830,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -2841,6 +2841,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
-@@ -3341,8 +3342,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -3342,8 +3343,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
  
  out:
  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
@@ -138,7 +138,7 @@
  	kfree(acl);
  	if (tempfh) {
 diff --git a/include/linux/security.h b/include/linux/security.h
-index a6574d13c6fb..5a681f60fd50 100644
+index 872e543d37dd..e439663c955f 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
 @@ -135,6 +135,37 @@ enum lockdown_reason {
@@ -179,7 +179,7 @@
  /*
   * Data exported by the security modules
   *
-@@ -587,7 +618,7 @@ int security_ismaclabel(const char *name);
+@@ -570,7 +601,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);
-@@ -1451,7 +1482,7 @@ static inline int security_secctx_to_secid(const char *secdata,
+@@ -1440,7 +1471,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 2b670ac129be..0eff57959b4e 100644
+index 8ec64e6e8bc0..c17ec23158c4 100644
 --- a/kernel/audit.c
 +++ b/kernel/audit.c
-@@ -1214,6 +1214,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -1192,6 +1192,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)
-@@ -1471,15 +1472,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
- 		}
- 		sig_data = kmalloc(struct_size(sig_data, ctx, len), GFP_KERNEL);
+@@ -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);
  		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, struct_size(sig_data, ctx, len));
-@@ -2171,6 +2175,7 @@ int audit_log_task_context(struct audit_buffer *ab)
+ 				 sig_data, sizeof(*sig_data) + len);
+@@ -2132,6 +2136,7 @@ int audit_log_task_context(struct audit_buffer *ab)
  	unsigned len;
  	int error;
  	struct lsmblob blob;
 +	struct lsmcontext scaff; /* scaffolding */
  
- 	security_current_getsecid_subj(&blob);
+ 	security_task_getsecid_subj(current, &blob);
  	if (!lsmblob_is_set(&blob))
-@@ -2185,7 +2190,8 @@ int audit_log_task_context(struct audit_buffer *ab)
+@@ -2145,7 +2150,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 52ea8da8462f..1503fb281278 100644
+index 930254bca7b5..3c72ff647fd8 100644
 --- a/kernel/auditsc.c
 +++ b/kernel/auditsc.c
-@@ -1121,6 +1121,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+@@ -1112,6 +1112,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;
-@@ -1138,7 +1139,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+@@ -1129,7 +1130,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=");
-@@ -1398,6 +1400,7 @@ static void audit_log_time(struct audit_context *context, struct audit_buffer **
+@@ -1342,6 +1344,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;
  
-@@ -1432,7 +1435,8 @@ static void show_special(struct audit_context *context, int *call_panic)
+@@ -1376,7 +1379,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) {
-@@ -1594,6 +1598,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+@@ -1533,6 +1537,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)) {
-@@ -1602,7 +1607,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
+@@ -1541,7 +1546,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 933a8f94f93a..70ca4510ea35 100644
+index be7073df19a5..dbba700fb151 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,10 +353,10 @@
  
  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 a28e275981d4..f053d7544355 100644
+index 67b0f3cfc5c7..40cbb00432d4 100644
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -348,6 +348,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
+@@ -342,6 +342,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
  	int len, ret;
  	char *secctx;
  	struct lsmblob blob;
@@ -364,7 +364,7 @@
  
  	/* lsmblob_init() puts ct->secmark into all of the secids in blob.
  	 * security_secid_to_secctx() will know which security module
-@@ -368,7 +369,8 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
+@@ -362,7 +363,8 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)
  
  	ret = 0;
  nla_put_failure:
@@ -375,7 +375,7 @@
  }
  #else
 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index bba3a66f5636..3b6ba86783f6 100644
+index 79c280d1efce..3fcf44342b14 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 6269fe122345..f69d5e997da2 100644
+index 62c0c5b847c6..5961a9b17f66 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 = 0;
- 	const struct nfnl_ct_hook *nfnl_ct;
+ 	enum ip_conntrack_info ctinfo;
+ 	struct nfnl_ct_hook *nfnl_ct;
  	bool csum_verify;
 +	struct lsmcontext scaff; /* scaffolding */
  	char *secdata = NULL;
  	u32 seclen = 0;
- 	ktime_t tstamp;
-@@ -634,8 +635,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+ 
+@@ -626,8 +627,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:
-@@ -643,8 +646,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
+@@ -635,8 +638,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 bbb3b6a4f0d7..b3e3d920034d 100644
+index 15b53fc4e83f..7cb6f27c8cb2 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 ec4d1b3026d8..407852be43da 100644
+index 1d734d9579f1..d14717fe0cb7 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2379,16 +2379,17 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
+@@ -2363,16 +2363,17 @@ int security_secctx_to_secid(const char *secdata, u32 seclen,
  }
  EXPORT_SYMBOL(security_secctx_to_secid);
  
@@ -563,5 +563,5 @@
  EXPORT_SYMBOL(security_release_secctx);
  
 -- 
-2.35.1
+2.31.1
`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