| Message ID | 20190315042016.3137-1-kjlu@umn.edu |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] net: openvswitch: fix a NULL pointer dereference | expand |
From: Kangjie Lu <kjlu@umn.edu> Date: Thu, 14 Mar 2019 23:20:16 -0500 > upcall is dereferenced even when genlmsg_put fails. The fix > goto out to avoid the NULL pointer dereference in this case. > > Signed-off-by: Kangjie Lu <kjlu@umn.edu> Applied.
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 6679e96ab1dc..45d1469308b0 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -448,6 +448,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 = -EINVAL; + goto out; + } upcall->dp_ifindex = dp_ifindex; err = ovs_nla_put_key(key, key, OVS_PACKET_ATTR_KEY, false, user_skb);
upcall is dereferenced even when genlmsg_put fails. The fix goto out to avoid the NULL pointer dereference in this case. Signed-off-by: Kangjie Lu <kjlu@umn.edu> --- net/openvswitch/datapath.c | 4 ++++ 1 file changed, 4 insertions(+)