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

Merge branch 'MCTP-fixes' 



Matt Johnston says:

====================
MCTP fixes

The following are fixes for the mctp core and mctp-i2c driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4298a62f 4a9dda1c

drivers/net/mctp/mctp-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static int mctp_i2c_header_create(struct sk_buff *skb, struct net_device *dev, 
	hdr->source_slave = ((llsrc << 1) & 0xff) | 0x01;

	mhdr->ver = 0x01;



	return 0;

	return sizeof(struct mctp_i2c_hdr);

}



static int mctp_i2c_tx_thread(void *data)

include/net/mctp.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ struct mctp_hdr { 
#define MCTP_HDR_TAG_SHIFT	0

#define MCTP_HDR_TAG_MASK	GENMASK(2, 0)



#define MCTP_HEADER_MAXLEN	4



#define MCTP_INITIAL_DEFAULT_NET	1



static inline bool mctp_address_unicast(mctp_eid_t eid)

net/mctp/af_mctp.c

+33 −13
Original line number Diff line number Diff line
@@ -93,13 +93,13 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen) 
static int mctp_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)

{

	DECLARE_SOCKADDR(struct sockaddr_mctp *, addr, msg->msg_name);

	const int hlen = MCTP_HEADER_MAXLEN + sizeof(struct mctp_hdr);

	int rc, addrlen = msg->msg_namelen;

	struct sock *sk = sock->sk;

	struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk);

	struct mctp_skb_cb *cb;

	struct mctp_route *rt;

	struct sk_buff *skb;

	struct sk_buff *skb = NULL;

	int hlen;



	if (addr) {

		const u8 tagbits = MCTP_TAG_MASK | MCTP_TAG_OWNER |
@@ -129,6 +129,34 @@ static int mctp_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	if (addr->smctp_network == MCTP_NET_ANY)

		addr->smctp_network = mctp_default_net(sock_net(sk));



	/* direct addressing */

	if (msk->addr_ext && addrlen >= sizeof(struct sockaddr_mctp_ext)) {

		DECLARE_SOCKADDR(struct sockaddr_mctp_ext *,

				 extaddr, msg->msg_name);

		struct net_device *dev;



		rc = -EINVAL;

		rcu_read_lock();

		dev = dev_get_by_index_rcu(sock_net(sk), extaddr->smctp_ifindex);

		/* check for correct halen */

		if (dev && extaddr->smctp_halen == dev->addr_len) {

			hlen = LL_RESERVED_SPACE(dev) + sizeof(struct mctp_hdr);

			rc = 0;

		}

		rcu_read_unlock();

		if (rc)

			goto err_free;

		rt = NULL;

	} else {

		rt = mctp_route_lookup(sock_net(sk), addr->smctp_network,

				       addr->smctp_addr.s_addr);

		if (!rt) {

			rc = -EHOSTUNREACH;

			goto err_free;

		}

		hlen = LL_RESERVED_SPACE(rt->dev->dev) + sizeof(struct mctp_hdr);

	}



	skb = sock_alloc_send_skb(sk, hlen + 1 + len,

				  msg->msg_flags & MSG_DONTWAIT, &rc);

	if (!skb)
@@ -147,8 +175,8 @@ static int mctp_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
	cb = __mctp_cb(skb);

	cb->net = addr->smctp_network;



	/* direct addressing */

	if (msk->addr_ext && addrlen >= sizeof(struct sockaddr_mctp_ext)) {

	if (!rt) {

		/* fill extended address in cb */

		DECLARE_SOCKADDR(struct sockaddr_mctp_ext *,

				 extaddr, msg->msg_name);
@@ -159,17 +187,9 @@ static int mctp_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) 
		}



		cb->ifindex = extaddr->smctp_ifindex;

		/* smctp_halen is checked above */

		cb->halen = extaddr->smctp_halen;

		memcpy(cb->haddr, extaddr->smctp_haddr, cb->halen);



		rt = NULL;

	} else {

		rt = mctp_route_lookup(sock_net(sk), addr->smctp_network,

				       addr->smctp_addr.s_addr);

		if (!rt) {

			rc = -EHOSTUNREACH;

			goto err_free;

		}

	}



	rc = mctp_local_output(sk, rt, skb, addr->smctp_addr.s_addr,

net/mctp/route.c

+12 −4
Original line number Diff line number Diff line
@@ -503,6 +503,11 @@ static int mctp_route_output(struct mctp_route *route, struct sk_buff *skb) 


	if (cb->ifindex) {

		/* direct route; use the hwaddr we stashed in sendmsg */

		if (cb->halen != skb->dev->addr_len) {

			/* sanity check, sendmsg should have already caught this */

			kfree_skb(skb);

			return -EMSGSIZE;

		}

		daddr = cb->haddr;

	} else {

		/* If lookup fails let the device handle daddr==NULL */
@@ -512,7 +517,7 @@ static int mctp_route_output(struct mctp_route *route, struct sk_buff *skb) 


	rc = dev_hard_header(skb, skb->dev, ntohs(skb->protocol),

			     daddr, skb->dev->dev_addr, skb->len);

	if (rc) {

	if (rc < 0) {

		kfree_skb(skb);

		return -EHOSTUNREACH;

	}
@@ -756,7 +761,7 @@ static int mctp_do_fragment_route(struct mctp_route *rt, struct sk_buff *skb, 
{

	const unsigned int hlen = sizeof(struct mctp_hdr);

	struct mctp_hdr *hdr, *hdr2;

	unsigned int pos, size;

	unsigned int pos, size, headroom;

	struct sk_buff *skb2;

	int rc;

	u8 seq;
@@ -770,6 +775,9 @@ static int mctp_do_fragment_route(struct mctp_route *rt, struct sk_buff *skb, 
		return -EMSGSIZE;

	}



	/* keep same headroom as the original skb */

	headroom = skb_headroom(skb);



	/* we've got the header */

	skb_pull(skb, hlen);
@@ -777,7 +785,7 @@ static int mctp_do_fragment_route(struct mctp_route *rt, struct sk_buff *skb, 
		/* size of message payload */

		size = min(mtu - hlen, skb->len - pos);



		skb2 = alloc_skb(MCTP_HEADER_MAXLEN + hlen + size, GFP_KERNEL);

		skb2 = alloc_skb(headroom + hlen + size, GFP_KERNEL);

		if (!skb2) {

			rc = -ENOMEM;

			break;
@@ -793,7 +801,7 @@ static int mctp_do_fragment_route(struct mctp_route *rt, struct sk_buff *skb, 
			skb_set_owner_w(skb2, skb->sk);



		/* establish packet */

		skb_reserve(skb2, MCTP_HEADER_MAXLEN);

		skb_reserve(skb2, headroom);

		skb_reset_network_header(skb2);

		skb_put(skb2, hlen + size);

		skb2->transport_header = skb2->network_header + hlen;