From: Greg Kroah-Hartman Date: Wed, 7 Aug 2019 17:33:53 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.2.8~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e39a64762af4df13731b3eb58fa45c435aead68;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: ib-directly-cast-the-sockaddr-union-to-aockaddr.patch rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch --- diff --git a/queue-4.14/ib-directly-cast-the-sockaddr-union-to-aockaddr.patch b/queue-4.14/ib-directly-cast-the-sockaddr-union-to-aockaddr.patch new file mode 100644 index 00000000000..368dce452cc --- /dev/null +++ b/queue-4.14/ib-directly-cast-the-sockaddr-union-to-aockaddr.patch @@ -0,0 +1,45 @@ +From 3cef0b8297395877695a223f5da5383a3d60aa6c Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 7 Aug 2019 18:44:12 +0200 +Subject: [PATCH] IB: directly cast the sockaddr union to aockaddr + +Like commit 641114d2af31 ("RDMA: Directly cast the sockaddr union to +sockaddr") we need to quiet gcc 9 from warning about this crazy union. +That commit did not fix all of the warnings in 4.19 and older kernels +because the logic in roce_resolve_route_from_path() was rewritten +between 4.19 and 5.2 when that change happened. + +Cc: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/core/sa_query.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/infiniband/core/sa_query.c ++++ b/drivers/infiniband/core/sa_query.c +@@ -1263,7 +1263,6 @@ int ib_init_ah_from_path(struct ib_devic + &init_net + }; + union { +- struct sockaddr _sockaddr; + struct sockaddr_in _sockaddr_in; + struct sockaddr_in6 _sockaddr_in6; + } sgid_addr, dgid_addr; +@@ -1271,12 +1270,13 @@ int ib_init_ah_from_path(struct ib_devic + if (!device->get_netdev) + return -EOPNOTSUPP; + +- rdma_gid2ip(&sgid_addr._sockaddr, &rec->sgid); +- rdma_gid2ip(&dgid_addr._sockaddr, &rec->dgid); ++ rdma_gid2ip((struct sockaddr *)&sgid_addr, &rec->sgid); ++ rdma_gid2ip((struct sockaddr *)&dgid_addr, &rec->dgid); + + /* validate the route */ +- ret = rdma_resolve_ip_route(&sgid_addr._sockaddr, +- &dgid_addr._sockaddr, &dev_addr); ++ ret = rdma_resolve_ip_route((struct sockaddr *)&sgid_addr, ++ (struct sockaddr *)&dgid_addr, ++ &dev_addr); + if (ret) + return ret; + diff --git a/queue-4.14/rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch b/queue-4.14/rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch new file mode 100644 index 00000000000..903cbe9582e --- /dev/null +++ b/queue-4.14/rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch @@ -0,0 +1,118 @@ +From 641114d2af312d39ca9bbc2369d18a5823da51c6 Mon Sep 17 00:00:00 2001 +From: Jason Gunthorpe +Date: Sun, 12 May 2019 21:57:57 -0300 +Subject: RDMA: Directly cast the sockaddr union to sockaddr + +From: Jason Gunthorpe + +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: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/infiniband/core/addr.c | 15 +++++++-------- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 5 ++--- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 ++--- + 3 files changed, 11 insertions(+), 14 deletions(-) + +--- a/drivers/infiniband/core/addr.c ++++ b/drivers/infiniband/core/addr.c +@@ -794,14 +794,13 @@ int rdma_addr_find_l2_eth_by_grh(const u + struct net_device *dev; + + union { +- struct sockaddr _sockaddr; + struct sockaddr_in _sockaddr_in; + struct sockaddr_in6 _sockaddr_in6; + } sgid_addr, dgid_addr; + + +- 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)); + if (if_index) +@@ -810,8 +809,9 @@ int rdma_addr_find_l2_eth_by_grh(const u + + ctx.addr = &dev_addr; + init_completion(&ctx.comp); +- ret = rdma_resolve_ip(&self, &sgid_addr._sockaddr, &dgid_addr._sockaddr, +- &dev_addr, 1000, resolve_cb, &ctx); ++ ret = rdma_resolve_ip(&self, (struct sockaddr *)&sgid_addr, ++ (struct sockaddr *)&dgid_addr, &dev_addr, 1000, ++ resolve_cb, &ctx); + if (ret) + return ret; + +@@ -841,16 +841,15 @@ int rdma_addr_find_smac_by_sgid(union ib + int ret = 0; + struct rdma_dev_addr dev_addr; + union { +- struct sockaddr _sockaddr; + struct sockaddr_in _sockaddr_in; + struct sockaddr_in6 _sockaddr_in6; + } gid_addr; + +- rdma_gid2ip(&gid_addr._sockaddr, sgid); ++ rdma_gid2ip((struct sockaddr *)&gid_addr, sgid); + + memset(&dev_addr, 0, sizeof(dev_addr)); + dev_addr.net = &init_net; +- ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id); ++ ret = rdma_translate_ip((struct sockaddr *)&gid_addr, &dev_addr, vlan_id); + if (ret) + return ret; + +--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c +@@ -83,7 +83,6 @@ static inline int set_av_attr(struct ocr + 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 ocr + 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 { +--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c ++++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +@@ -2508,7 +2508,6 @@ static int ocrdma_set_av_params(struct o + 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; +@@ -2556,8 +2555,8 @@ static int ocrdma_set_av_params(struct o + + hdr_type = ib_gid_to_network_type(sgid_attr.gid_type, &sgid); + if (hdr_type == RDMA_NETWORK_IPV4) { +- rdma_gid2ip(&sgid_addr._sockaddr, &sgid); +- rdma_gid2ip(&dgid_addr._sockaddr, &grh->dgid); ++ rdma_gid2ip((struct sockaddr *)&sgid_addr, &sgid); ++ 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], diff --git a/queue-4.14/series b/queue-4.14/series index f7e9a7a244a..ea0452aaae7 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -5,3 +5,5 @@ tcp-be-more-careful-in-tcp_fragment.patch arm64-cpufeature-fix-feature-comparison-for-ctr_el0.-cwg-erg.patch hid-wacom-fix-bit-shift-for-cintiq-companion-2.patch hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch +rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch +ib-directly-cast-the-sockaddr-union-to-aockaddr.patch