Mon Aug 31 20:34:43 2020 UTC ()

wg: Avoid memory leak if socreate fails.


(riastradh)

diff -r1.50 -r1.51 src/sys/net/if_wg.c

--- src/sys/net/if_wg.c 2020/08/31 20:34:18	1.50
+++ src/sys/net/if_wg.c 2020/08/31 20:34:43	1.51

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wg.c,v 1.50 2020/08/31 20:34:18 riastradh Exp $	*/
+/*	$NetBSD: if_wg.c,v 1.51 2020/08/31 20:34:43 riastradh Exp $	*/
 /*
  * Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -31,27 +31,27 @@
 /*
  * This network interface aims to implement the WireGuard protocol.
  * The implementation is based on the paper of WireGuard as of
  * 2018-06-30 [1].  The paper is referred in the source code with label
  * [W].  Also the specification of the Noise protocol framework as of
  * 2018-07-11 [2] is referred with label [N].
+ *
  * [1] https://www.wireguard.com/papers/wireguard.pdf
  * [2] http://noiseprotocol.org/noise.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.50 2020/08/31 20:34:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.51 2020/08/31 20:34:43 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/callout.h>
 #include <sys/cprng.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 @@ -3167,27 +3167,27 @@ wg_worker_socreate(struct wg_softc *wg,
 	*sop = so;
 	return 0;
+}
 static int
 wg_worker_init(struct wg_softc *wg)
+{
 	int error;
 	struct wg_worker *wgw;
 	const char *ifname = wg->wg_if.if_xname;
 	struct socket *so;
-	wgw = kmem_zalloc(sizeof(struct wg_worker), KM_SLEEP);
+	wgw = kmem_zalloc(sizeof(*wgw), KM_SLEEP);
 	mutex_init(&wgw->wgw_lock, MUTEX_DEFAULT, IPL_SOFTNET);
 	cv_init(&wgw->wgw_cv, ifname);
 	wgw->wgw_todie = false;
 	wgw->wgw_wakeup_reasons = 0;
 	error = wg_worker_socreate(wg, wgw, AF_INET, &so);
 	if (error != 0)
 		goto error;
 	wgw->wgw_so4 = so;
 #ifdef INET6
 	error = wg_worker_socreate(wg, wgw, AF_INET6, &so);
 	if (error != 0)
 @@ -3204,26 +3204,28 @@ wg_worker_init(struct wg_softc *wg)
 	return 0;
 error:
 #ifdef INET6
 	if (wgw->wgw_so6 != NULL)
 		soclose(wgw->wgw_so6);
 #endif
 	if (wgw->wgw_so4 != NULL)
 		soclose(wgw->wgw_so4);
 	cv_destroy(&wgw->wgw_cv);
 	mutex_destroy(&wgw->wgw_lock);
 	kmem_free(wgw, sizeof(*wgw));
 	return error;
+}
 static void
 wg_worker_destroy(struct wg_softc *wg)
+{
 	struct wg_worker *wgw = wg->wg_worker;
 	mutex_enter(&wgw->wgw_lock);
 	wgw->wgw_todie = true;
 	wgw->wgw_wakeup_reasons = 0;
 	cv_broadcast(&wgw->wgw_cv);
 	mutex_exit(&wgw->wgw_lock);