Received: by 10.223.176.5 with SMTP id f5csp328507wra; Thu, 8 Feb 2018 23:01:57 -0800 (PST) X-Google-Smtp-Source: AH8x2247R8cUhtXDIbOL0jKkFm3vs5xbJ9Nrn9GxXA66qxnKG7CNU2X4bukOmK/IRMk059tPyQKn X-Received: by 10.99.189.26 with SMTP id a26mr1509844pgf.373.1518159717063; Thu, 08 Feb 2018 23:01:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518159717; cv=none; d=google.com; s=arc-20160816; b=iK0wVWU2xulBM+Gbf+GVdPEQ5uBIlc/GkGs9wKWG1se3pvMFtZLI69oWECZ3ZLOC7E D6vp1UBDqnyTJ6Kmaq96CMBaezCGPZ2H/EFLu2NsPqkJm6kVCIdg0BgiKglTFAoMjdda zD8E4JoUeGP7QGVbtiVKMvqPM9btATCJhv8/Iq8Bq9VmXyJ9jPCIhU9TwruPLiY+8bB2 9y8zYI38Wrf1ITRdX4PA5BsAnxhmeoAJKY7wX9RR7QuavS5MKUC++wlDQ1XoXV8YJx1d kD9bmKy3Ll3PV3soIPEcAN7v6eYYkr2+YpHpFmR/ivETQuf7GSk5Aln3vtqEXOUSjTMb Hrvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date :arc-authentication-results; bh=QRn09pgnlx9xNvdMDJYhuGaVtu5LX0jCwLFuAtShU7A=; b=jI9JSZPLKLJN7mUKRy8tee+LfqCw2baBA1J3C2jLHPKY/NC6w5PbPT5eUirgGCBnx7 2Zr1sDvpNCpskfVnFnDOnhPrjATLK5M91TPwmPCTF6XShw9FznGMl8jVM5C2VdMPdEhS At23kaasPuwu0zVT7sYl0B3hWMAODYga0tx3MklUnI84heTR2gdNo8RBykV4uZY9zrOd bk/tG5F4S2UNIqBlKL7rRPCY2G4XNX56DhGapCIafLfhX2LEjyMoDyIhxcud2AYpSDLv qDbAn93gDZRmxhtu6uhfmAEgi13UQ9wu1cbTjpbEZI7wG/z5EbuMKlBgUbbc6hz1uwvI Ri0A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g5si1015863pgo.780.2018.02.08.23.01.43; Thu, 08 Feb 2018 23:01:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587AbeBIHAm (ORCPT + 99 others); Fri, 9 Feb 2018 02:00:42 -0500 Received: from gateway20.websitewelcome.com ([192.185.62.46]:11404 "EHLO gateway20.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751047AbeBIHAG (ORCPT ); Fri, 9 Feb 2018 02:00:06 -0500 X-Greylist: delayed 1381 seconds by postgrey-1.27 at vger.kernel.org; Fri, 09 Feb 2018 02:00:06 EST Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 65FD9400C7DD9 for ; Fri, 9 Feb 2018 00:37:04 -0600 (CST) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id k2IyeZaeNvkfxk2Iye2Jhy; Fri, 09 Feb 2018 00:37:04 -0600 Received: from [189.175.4.238] (port=44932 helo=embeddedgus) by gator4166.hostgator.com with esmtpa (Exim 4.89_1) (envelope-from ) id 1ek2Ix-002htd-Va; Fri, 09 Feb 2018 00:37:04 -0600 Date: Fri, 9 Feb 2018 00:37:02 -0600 From: "Gustavo A. R. Silva" To: Doug Ledford , Jason Gunthorpe Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] RDMA/nldev: Fix multiple potential NULL pointer dereferences Message-ID: <20180209063702.GA28685@embeddedgus> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.175.4.238 X-Source-L: No X-Exim-ID: 1ek2Ix-002htd-Va X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedgus) [189.175.4.238]:44932 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 4 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case the message header and payload cannot be stored, function nlmsg_put returns null. Fix this by adding multiple sanity checks and avoid a potential null dereference on _nlh_ when calling nlmsg_end. Addresses-Coverity-ID: 1454215 ("Dereference null return value") Addresses-Coverity-ID: 1454223 ("Dereference null return value") Addresses-Coverity-ID: 1454224 ("Dereference null return value") Addresses-Coverity-ID: 1464669 ("Dereference null return value") Addresses-Coverity-ID: 1464670 ("Dereference null return value") Addresses-Coverity-ID: 1464672 ("Dereference null return value") Fixes: e5c9469efcb1 ("RDMA/netlink: Add nldev device doit implementation") Fixes: c3f66f7b0052 ("RDMA/netlink: Implement nldev port doit callback") Fixes: 7d02f605f0dc ("RDMA/netlink: Add nldev port dumpit implementation") Fixes: b5fa635aab8f ("RDMA/nldev: Provide detailed QP information") Fixes: bf3c5a93c523 ("RDMA/nldev: Provide global resource utilization") Signed-off-by: Gustavo A. R. Silva --- drivers/infiniband/core/nldev.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 5326a68..dc8f6eb 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -313,6 +313,11 @@ static int nldev_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, nlh = nlmsg_put(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET), 0, 0); + if (!nlh) { + err = -EMSGSIZE; + goto err_free; + + } err = fill_dev_info(msg, device); if (err) @@ -344,6 +349,8 @@ static int _nldev_get_dumpit(struct ib_device *device, nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET), 0, NLM_F_MULTI); + if (!nlh) + goto out; if (fill_dev_info(skb, device)) { nlmsg_cancel(skb, nlh); @@ -354,7 +361,8 @@ static int _nldev_get_dumpit(struct ib_device *device, idx++; -out: cb->args[0] = idx; +out: + cb->args[0] = idx; return skb->len; } @@ -404,6 +412,10 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, nlh = nlmsg_put(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_GET), 0, 0); + if (!nlh) { + err = -EMSGSIZE; + goto err_free; + } err = fill_port_info(msg, device, port); if (err) @@ -464,6 +476,8 @@ static int nldev_port_get_dumpit(struct sk_buff *skb, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_PORT_GET), 0, NLM_F_MULTI); + if (!nlh) + goto out; if (fill_port_info(skb, device, p)) { nlmsg_cancel(skb, nlh); @@ -507,6 +521,10 @@ static int nldev_res_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, nlh = nlmsg_put(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_RES_GET), 0, 0); + if (!nlh) { + ret = -EMSGSIZE; + goto err_free; + } ret = fill_res_info(msg, device); if (ret) @@ -537,6 +555,8 @@ static int _nldev_res_get_dumpit(struct ib_device *device, nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_RES_GET), 0, NLM_F_MULTI); + if (!nlh) + goto out; if (fill_res_info(skb, device)) { nlmsg_cancel(skb, nlh); @@ -603,6 +623,10 @@ static int nldev_res_get_qp_dumpit(struct sk_buff *skb, nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, RDMA_NL_GET_TYPE(RDMA_NL_NLDEV, RDMA_NLDEV_CMD_RES_QP_GET), 0, NLM_F_MULTI); + if (!nlh) { + ret = -EMSGSIZE; + goto err_index; + } if (fill_nldev_handle(skb, device)) { ret = -EMSGSIZE; -- 2.7.4