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

Commit d022af27 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'connector' 



Mathias Krause says:

====================
This series fixes a few netlink related issues of the connector interface.

The first two patches are bug fixes. The last two are cleanups.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c31eeace 05742faf

Documentation/connector/ucon.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg) 
	nlh->nlmsg_seq = seq++;

	nlh->nlmsg_pid = getpid();

	nlh->nlmsg_type = NLMSG_DONE;

	nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));

	nlh->nlmsg_len = size;

	nlh->nlmsg_flags = 0;



	m = NLMSG_DATA(nlh);

drivers/connector/cn_proc.c

+18 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void proc_fork_connector(struct task_struct *task) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -80,6 +81,7 @@ void proc_fork_connector(struct task_struct *task) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	/*  If cn_netlink_send() failed, the data is not sent */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -96,6 +98,7 @@ void proc_exec_connector(struct task_struct *task) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -106,6 +109,7 @@ void proc_exec_connector(struct task_struct *task) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -122,6 +126,7 @@ void proc_id_connector(struct task_struct *task, int which_id) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	ev->what = which_id;

	ev->event_data.id.process_pid = task->pid;

	ev->event_data.id.process_tgid = task->tgid;
@@ -145,6 +150,7 @@ void proc_id_connector(struct task_struct *task, int which_id) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -160,6 +166,7 @@ void proc_sid_connector(struct task_struct *task) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -170,6 +177,7 @@ void proc_sid_connector(struct task_struct *task) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -185,6 +193,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -203,6 +212,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -218,6 +228,7 @@ void proc_comm_connector(struct task_struct *task) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -229,6 +240,7 @@ void proc_comm_connector(struct task_struct *task) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -244,6 +256,7 @@ void proc_coredump_connector(struct task_struct *task) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -254,6 +267,7 @@ void proc_coredump_connector(struct task_struct *task) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -269,6 +283,7 @@ void proc_exit_connector(struct task_struct *task) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -281,6 +296,7 @@ void proc_exit_connector(struct task_struct *task) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}
@@ -304,6 +320,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) 


	msg = (struct cn_msg *)buffer;

	ev = (struct proc_event *)msg->data;

	memset(&ev->event_data, 0, sizeof(ev->event_data));

	msg->seq = rcvd_seq;

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -313,6 +330,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) 
	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = rcvd_ack + 1;

	msg->len = sizeof(*ev);

	msg->flags = 0; /* not used */

	cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);

}

drivers/connector/connector.c

+5 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask) 


	data = nlmsg_data(nlh);



	memcpy(data, msg, sizeof(*data) + msg->len);

	memcpy(data, msg, size);



	NETLINK_CB(skb).dst_group = group;
@@ -157,17 +157,18 @@ static int cn_call_callback(struct sk_buff *skb) 
static void cn_rx_skb(struct sk_buff *__skb)

{

	struct nlmsghdr *nlh;

	int err;

	struct sk_buff *skb;

	int len, err;



	skb = skb_get(__skb);



	if (skb->len >= NLMSG_HDRLEN) {

		nlh = nlmsg_hdr(skb);

		len = nlmsg_len(nlh);



		if (nlh->nlmsg_len < sizeof(struct cn_msg) ||

		if (len < (int)sizeof(struct cn_msg) ||

		    skb->len < nlh->nlmsg_len ||

		    nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {

		    len > CONNECTOR_MAX_MSG_SIZE) {

			kfree_skb(skb);

			return;

		}