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

Commit 89c49e7b authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Greg Kroah-Hartman
Browse files

RDMA: Directly cast the sockaddr union to sockaddr 



commit 641114d2af312d39ca9bbc2369d18a5823da51c6 upstream.

gcc 9 now does allocation size tracking and thinks that passing the member
of a union and then accessing beyond that member's bounds is an overflow.

Instead of using the union member, use the entire union with a cast to
get to the sockaddr. gcc will now know that the memory extends the full
size of the union.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a319c8ff

drivers/infiniband/core/addr.c

+5 −5
Original line number Diff line number Diff line
@@ -716,22 +716,22 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid, 
	struct rdma_dev_addr dev_addr;

	struct resolve_cb_context ctx;

	union {

		struct sockaddr     _sockaddr;

		struct sockaddr_in  _sockaddr_in;

		struct sockaddr_in6 _sockaddr_in6;

	} sgid_addr, dgid_addr;

	int ret;



	rdma_gid2ip(&sgid_addr._sockaddr, sgid);

	rdma_gid2ip(&dgid_addr._sockaddr, dgid);

	rdma_gid2ip((struct sockaddr *)&sgid_addr, sgid);

	rdma_gid2ip((struct sockaddr *)&dgid_addr, dgid);



	memset(&dev_addr, 0, sizeof(dev_addr));

	dev_addr.bound_dev_if = ndev->ifindex;

	dev_addr.net = &init_net;



	init_completion(&ctx.comp);

	ret = rdma_resolve_ip(&sgid_addr._sockaddr, &dgid_addr._sockaddr,

			      &dev_addr, 1000, resolve_cb, &ctx);

	ret = rdma_resolve_ip((struct sockaddr *)&sgid_addr,

			      (struct sockaddr *)&dgid_addr, &dev_addr, 1000,

			      resolve_cb, &ctx);

	if (ret)

		return ret;

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

+2 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah, 
	struct iphdr ipv4;

	const struct ib_global_route *ib_grh;

	union {

		struct sockaddr     _sockaddr;

		struct sockaddr_in  _sockaddr_in;

		struct sockaddr_in6 _sockaddr_in6;

	} sgid_addr, dgid_addr;
@@ -133,9 +132,9 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah, 
		ipv4.tot_len = htons(0);

		ipv4.ttl = ib_grh->hop_limit;

		ipv4.protocol = nxthdr;

		rdma_gid2ip(&sgid_addr._sockaddr, sgid);

		rdma_gid2ip((struct sockaddr *)&sgid_addr, sgid);

		ipv4.saddr = sgid_addr._sockaddr_in.sin_addr.s_addr;

		rdma_gid2ip(&dgid_addr._sockaddr, &ib_grh->dgid);

		rdma_gid2ip((struct sockaddr*)&dgid_addr, &ib_grh->dgid);

		ipv4.daddr = dgid_addr._sockaddr_in.sin_addr.s_addr;

		memcpy((u8 *)ah->av + eth_sz, &ipv4, sizeof(struct iphdr));

	} else {

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+2 −3
Original line number Diff line number Diff line
@@ -2499,7 +2499,6 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, 
	u32 vlan_id = 0xFFFF;

	u8 mac_addr[6], hdr_type;

	union {

		struct sockaddr     _sockaddr;

		struct sockaddr_in  _sockaddr_in;

		struct sockaddr_in6 _sockaddr_in6;

	} sgid_addr, dgid_addr;
@@ -2541,8 +2540,8 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, 


	hdr_type = rdma_gid_attr_network_type(sgid_attr);

	if (hdr_type == RDMA_NETWORK_IPV4) {

		rdma_gid2ip(&sgid_addr._sockaddr, &sgid_attr->gid);

		rdma_gid2ip(&dgid_addr._sockaddr, &grh->dgid);

		rdma_gid2ip((struct sockaddr *)&sgid_addr, &sgid_attr->gid);

		rdma_gid2ip((struct sockaddr *)&dgid_addr, &grh->dgid);

		memcpy(&cmd->params.dgid[0],

		       &dgid_addr._sockaddr_in.sin_addr.s_addr, 4);

		memcpy(&cmd->params.sgid[0],