[src/netbsd-8]: src/sys/netatalk Pull up following revision(s) (requested by ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aba58ee685ef
branches:  netbsd-8
changeset: 851269:aba58ee685ef
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jan 09 19:20:17 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #479):
        sys/netatalk/aarp.c: revision 1.40
Mmh, pull up the packet to ether_aarp, otherwise we're reading past the
end of the mbuf.

diffstat:

 sys/netatalk/aarp.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 64085657b7f2 -r aba58ee685ef sys/netatalk/aarp.c
--- a/sys/netatalk/aarp.c       Sun Jan 07 09:32:36 2018 +0000
+++ b/sys/netatalk/aarp.c       Tue Jan 09 19:20:17 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aarp.c,v 1.39 2016/08/01 03:15:30 ozaki-r Exp $        */
+/*     $NetBSD: aarp.c,v 1.39.8.1 2018/01/09 19:20:17 snj Exp $        */
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.39 2016/08/01 03:15:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.39.8.1 2018/01/09 19:20:17 snj Exp $");
 
 #include "opt_mbuftrace.h"
 
@@ -351,6 +351,11 @@
        struct psref    psref;
        struct ifaddr *ifa;
 
+       /* We should also check ar_hln and ar_pln. */
+       if ((m = m_pullup(m, sizeof(struct ether_aarp))) == NULL) {
+               return;
+       }
+
        ea = mtod(m, struct ether_aarp *);
 
        /* Check to see if from my hardware address */