Module Name: src
Committed By: ozaki-r
Date: Fri Nov 6 08:38:43 UTC 2015
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
Fix inappropriate rt_flags check
It depended on either RTF_CLONED or RTF_CLONING must be set, however,
the assumption didn't meet for userland problems that create a route
via RTM_ADD.
This fixes an issue that running rarpd causes the following kernel panic
reported by nonaka@:
panic: kernel diagnostic assertion "(la->la_flags & LLE_STATIC) == 0"
failed: file "/usr/src/sys/netinet/if_arp.c", line 1339
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/netinet/if_arp.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.191 src/sys/netinet/if_arp.c:1.192
--- src/sys/netinet/if_arp.c:1.191 Tue Oct 20 07:46:59 2015
+++ src/sys/netinet/if_arp.c Fri Nov 6 08:38:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.191 2015/10/20 07:46:59 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.192 2015/11/06 08:38:43 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.191 2015/10/20 07:46:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.192 2015/11/06 08:38:43 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -621,7 +621,7 @@ arp_rtrequest(int req, struct rtentry *r
* add with a LL address.
*/
flags = LLE_EXCLUSIVE;
- if ((rt->rt_flags & RTF_CLONED) == 0)
+ if ((rt->rt_flags & RTF_CLONING) != 0)
flags |= LLE_IFADDR;
IF_AFDATA_WLOCK(ifp);
