Module Name:    src
Committed By:   martin
Date:           Thu Oct 10 17:30:02 UTC 2019

Modified Files:
        src/sys/netatalk [netbsd-9]: at_var.h

Log Message:
Pull up following revision(s) (requested by maxv in ticket #297):

        sys/netatalk/at_var.h: revision 1.9

Memset to prevent stack info leak.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/netatalk/at_var.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netatalk/at_var.h
diff -u src/sys/netatalk/at_var.h:1.8 src/sys/netatalk/at_var.h:1.8.6.1
--- src/sys/netatalk/at_var.h:1.8	Thu Apr 19 21:50:10 2018
+++ src/sys/netatalk/at_var.h	Thu Oct 10 17:30:02 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: at_var.h,v 1.8 2018/04/19 21:50:10 christos Exp $	 */
+/*	$NetBSD: at_var.h,v 1.8.6.1 2019/10/10 17:30:02 martin Exp $	 */
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -75,13 +75,13 @@ sockaddr_at_init1(struct sockaddr_at *sa
 {
 	sat->sat_port = port;
 	sat->sat_addr = *addr;
-	memset(&sat->sat_range, 0, sizeof(sat->sat_range));
 }
 
 static __inline void
 sockaddr_at_init(struct sockaddr_at *sat, const struct at_addr *addr,
     uint8_t port)
 {
+	memset(sat, 0, sizeof(*sat));
 	sat->sat_family = AF_APPLETALK;
 	sat->sat_len = sizeof(*sat);
 	sockaddr_at_init1(sat, addr, port);
@@ -92,7 +92,8 @@ sockaddr_at_alloc(const struct at_addr *
 {
 	struct sockaddr *sa;
 
-	sa = sockaddr_alloc(AF_APPLETALK, sizeof(struct sockaddr_at), flags);
+	sa = sockaddr_alloc(AF_APPLETALK, sizeof(struct sockaddr_at),
+	    flags | M_ZERO);
 
 	if (sa == NULL)
 		return NULL;

Reply via email to