Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/net CID 980463: Provide common error path for rollback. ...
details: https://anonhg.NetBSD.org/src/rev/11ec41943142
branches: trunk
changeset: 811668:11ec41943142
user: christos <christos%NetBSD.org@localhost>
date: Tue Nov 10 17:59:37 2015 +0000
description:
CID 980463: Provide common error path for rollback. Remove extra check for
success.
diffstat:
sys/net/if_gif.c | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diffs (100 lines):
diff -r b39d2de83046 -r 11ec41943142 sys/net/if_gif.c
--- a/sys/net/if_gif.c Tue Nov 10 13:01:41 2015 +0000
+++ b/sys/net/if_gif.c Tue Nov 10 17:59:37 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.88 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: if_gif.c,v 1.89 2015/11/10 17:59:37 christos Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.88 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.89 2015/11/10 17:59:37 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -669,6 +669,8 @@
s = splsoftnet();
+ osrc = sc->gif_psrc;
+ odst = sc->gif_pdst;
LIST_FOREACH(sc2, &gif_softc_list, gif_list) {
if (sc2 == sc)
continue;
@@ -704,17 +706,23 @@
#endif
}
+ sc->gif_psrc = sc->gif_pdst = NULL;
+
sc->gif_si = softint_establish(SOFTINT_NET, gifintr, sc);
if (sc->gif_si == NULL) {
error = ENOMEM;
goto bad;
}
- osrc = sc->gif_psrc;
- sc->gif_psrc = sockaddr_dup(src, M_WAITOK);
+ if ((sc->gif_psrc = sockaddr_dup(src, M_WAITOK)) == NULL) {
+ error = ENOMEM;
+ goto bad;
+ }
- odst = sc->gif_pdst;
- sc->gif_pdst = sockaddr_dup(dst, M_WAITOK);
+ if ((sc->gif_pdst = sockaddr_dup(dst, M_WAITOK)) == NULL) {
+ error = ENOMEM;
+ goto bad;
+ }
switch (sc->gif_psrc->sa_family) {
#ifdef INET
@@ -731,33 +739,33 @@
error = EINVAL;
break;
}
- if (error) {
- /* rollback */
- sockaddr_free(sc->gif_psrc);
- sockaddr_free(sc->gif_pdst);
- sc->gif_psrc = osrc;
- sc->gif_pdst = odst;
+ if (error)
goto bad;
- }
if (osrc)
sockaddr_free(osrc);
if (odst)
sockaddr_free(odst);
- if (sc->gif_psrc && sc->gif_pdst)
- ifp->if_flags |= IFF_RUNNING;
- else
- ifp->if_flags &= ~IFF_RUNNING;
+ ifp->if_flags |= IFF_RUNNING;
splx(s);
return 0;
bad:
+ /* rollback */
+ if (sc->gif_psrc != NULL)
+ sockaddr_free(sc->gif_psrc);
+ if (sc->gif_pdst != NULL)
+ sockaddr_free(sc->gif_pdst);
+ sc->gif_psrc = osrc;
+ sc->gif_pdst = odst;
+
if (sc->gif_si) {
softint_disestablish(sc->gif_si);
sc->gif_si = NULL;
}
+
if (sc->gif_psrc && sc->gif_pdst)
ifp->if_flags |= IFF_RUNNING;
else
Home |
Main Index |
Thread Index |
Old Index