Module Name: src Committed By: ozaki-r Date: Thu Aug 15 04:20:59 UTC 2019
Modified Files: src/sys/net: if.c Log Message: Restore if_ioctl on error of ifc_destroy Otherwise subsequence ioctls won't work. Patch from Harold Gutch on PR kern/54434 (tweaked a bit by me) To generate a diff of this commit: cvs rdiff -u -r1.457 -r1.458 src/sys/net/if.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/net/if.c diff -u src/sys/net/if.c:1.457 src/sys/net/if.c:1.458 --- src/sys/net/if.c:1.457 Thu Jul 25 07:45:57 2019 +++ src/sys/net/if.c Thu Aug 15 04:20:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.457 2019/07/25 07:45:57 knakahara Exp $ */ +/* $NetBSD: if.c,v 1.458 2019/08/15 04:20:59 ozaki-r Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.457 2019/07/25 07:45:57 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.458 2019/08/15 04:20:59 ozaki-r Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -1611,6 +1611,8 @@ if_clone_destroy(const char *name) struct if_clone *ifc; struct ifnet *ifp; struct psref psref; + int error; + int (*if_ioctl)(struct ifnet *, u_long, void *); KASSERT(mutex_owned(&if_clone_mtx)); @@ -1627,6 +1629,7 @@ if_clone_destroy(const char *name) /* We have to disable ioctls here */ IFNET_LOCK(ifp); + if_ioctl = ifp->if_ioctl; ifp->if_ioctl = if_nullioctl; IFNET_UNLOCK(ifp); @@ -1636,7 +1639,16 @@ if_clone_destroy(const char *name) */ if_put(ifp, &psref); - return (*ifc->ifc_destroy)(ifp); + error = (*ifc->ifc_destroy)(ifp); + + if (error != 0) { + /* We have to restore if_ioctl on error */ + IFNET_LOCK(ifp); + ifp->if_ioctl = if_ioctl; + IFNET_UNLOCK(ifp); + } + + return error; } static bool