Module Name: src
Committed By: riastradh
Date: Thu Aug 27 02:51:15 UTC 2020
Modified Files:
src/sys/rump/net/lib/libwg: wg_user.c
Log Message:
Fix order of cleanup actions in rumpuser_wg_create error branch.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libwg/wg_user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libwg/wg_user.c
diff -u src/sys/rump/net/lib/libwg/wg_user.c:1.2 src/sys/rump/net/lib/libwg/wg_user.c:1.3
--- src/sys/rump/net/lib/libwg/wg_user.c:1.2 Thu Aug 27 02:50:44 2020
+++ src/sys/rump/net/lib/libwg/wg_user.c Thu Aug 27 02:51:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wg_user.c,v 1.2 2020/08/27 02:50:44 riastradh Exp $ */
+/* $NetBSD: wg_user.c,v 1.3 2020/08/27 02:51:15 riastradh Exp $ */
/*
* Copyright (C) Ryota Ozaki <ozaki.ry...@gmail.com>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wg_user.c,v 1.2 2020/08/27 02:50:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wg_user.c,v 1.3 2020/08/27 02:51:15 riastradh Exp $");
#ifndef _KERNEL
#include <sys/types.h>
@@ -277,13 +277,13 @@ rumpuser_wg_create(const char *tun_name,
return 0;
oerr5:
- close(wgu->wgu_pipe[0]);
- close(wgu->wgu_pipe[1]);
- oerr4:
if (wgu->wgu_sock4 != -1)
close(wgu->wgu_sock4);
if (wgu->wgu_sock6 != -1)
close(wgu->wgu_sock6);
+ oerr4:
+ close(wgu->wgu_pipe[0]);
+ close(wgu->wgu_pipe[1]);
oerr3:
close_tun(wgu);
oerr2:
