o Make rt_check() function more strict:

  - rt0 passed to rt_check() must not be NULL, assert this.
  - rt returned by rt_check() must be valid locked rtentry,
    if no error occured.
o Modify callers, so that they never pass NULL rt0
  to rt_check().

Reviewed by:	sam, ume (nd6.c)

1 files changed, 6 insertions, 0 deletions

diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 2c4cc53..4265b31 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -2065,6 +2065,12 @@ nd6_storelladdr(ifp, rt0, m, dst, desten)
 		}
 	}
 
+	if (rt0 == NULL) {
+		/* this could happen, if we could not allocate memory */
+		m_freem(m);
+		return (ENOMEM);
+	}
+
 	error = rt_check(&rt, &rt0, dst);
 	if (error) {
 		m_freem(m);