From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754774AbdKIN7r (ORCPT ); Thu, 9 Nov 2017 08:59:47 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:54415 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752655AbdKIN7p (ORCPT ); Thu, 9 Nov 2017 08:59:45 -0500 From: Colin King To: Pravin Shelar , "David S . Miller" , netdev@vger.kernel.org, dev@openvswitch.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] openvswitch: add null pointer check on upcall Date: Thu, 9 Nov 2017 13:59:43 +0000 Message-Id: <20171109135943.418-1-colin.king@canonical.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King upcall may be assigned a NULL pointer as genlmsg_put can potentially return a NULL. Add a null check to avoid a null pointer dereference on upcall. Detected by CoverityScan, CID#728404 ("Dereference null return value") Fixes: commit ccb1352e76cf ("net: Add Open vSwitch kernel components.") Signed-off-by: Colin Ian King --- net/openvswitch/datapath.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 4d38ac044cee..e8fb3d76fa6e 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -461,6 +461,10 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, upcall = genlmsg_put(user_skb, 0, 0, &dp_packet_genl_family, 0, upcall_info->cmd); + if (!upcall) { + err = -ENOBUFS; + goto out; + } upcall->dp_ifindex = dp_ifindex; err = ovs_nla_put_key(key, key, OVS_PACKET_ATTR_KEY, false, user_skb); -- 2.14.1