diff options
| author | Nicolas Iooss | 2018-07-01 10:42:47 +0200 |
|---|---|---|
| committer | Nicolas Iooss | 2018-07-01 10:42:47 +0200 |
| commit | 57573b6316f588a4d9bfc7282ac4b6c47f1934e2 (patch) | |
| tree | b921d1ae62a097a534f7f4d282e2184671da6afc /tuntap.patch | |
| parent | 773876f1aa81db4b6f70b8cc307e4dfddca82896 (diff) | |
| download | aur-57573b6316f588a4d9bfc7282ac4b6c47f1934e2.tar.gz | |
openssh-selinux 7.7p1-2 update
Diffstat (limited to 'tuntap.patch')
| -rw-r--r-- | tuntap.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tuntap.patch b/tuntap.patch new file mode 100644 index 000000000000..232d8e59b80c --- /dev/null +++ b/tuntap.patch @@ -0,0 +1,35 @@ +From cfb1d9bc76734681e3dea532a1504fcd466fbe91 Mon Sep 17 00:00:00 2001 +From: Damien Miller <djm@mindrot.org> +Date: Fri, 13 Apr 2018 13:38:06 +1000 +Subject: Fix tunnel forwarding broken in 7.7p1 + +bz2855, ok dtucker@ +--- + openbsd-compat/port-net.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c +index 7050629..bb53562 100644 +--- a/openbsd-compat/port-net.c ++++ b/openbsd-compat/port-net.c +@@ -185,7 +185,7 @@ sys_tun_open(int tun, int mode, char **ifname) + else + debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd); + +- if (ifname != NULL && (*ifname = strdup(ifr.ifr_name))) ++ if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL) + goto failed; + + return (fd); +@@ -272,7 +272,7 @@ sys_tun_open(int tun, int mode, char **ifname) + goto failed; + } + +- if (ifname != NULL && (*ifname = strdup(ifr.ifr_name))) ++ if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL) + goto failed; + + close(sock); +-- +cgit v1.1 + |