Commit aaa8e492 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

net: qrtr: make checks in qrtr_endpoint_post() stricter 



These checks are still not strict enough.  The main problem is that if
"cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is
guaranteed to be 4 but we need to be at least 16 bytes.  In fact, we
can reject everything smaller than sizeof(*pkt) which is 20 bytes.

Also I don't like the ALIGN(size, 4).  It's better to just insist that
data is needs to be aligned at the start.

Fixes: 0baa99ee ("net: qrtr: Allow non-immediate node routing")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efe487fc

net/qrtr/qrtr.c

+6 −2
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) 
		goto err;

	}



	if (!size || len != ALIGN(size, 4) + hdrlen)

	if (!size || size & 3 || len != size + hdrlen)

		goto err;



	if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&
@@ -506,8 +506,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) 


	if (cb->type == QRTR_TYPE_NEW_SERVER) {

		/* Remote node endpoint can bridge other distant nodes */

		const struct qrtr_ctrl_pkt *pkt = data + hdrlen;

		const struct qrtr_ctrl_pkt *pkt;



		if (size < sizeof(*pkt))

			goto err;



		pkt = data + hdrlen;

		qrtr_node_assign(node, le32_to_cpu(pkt->server.node));

	}