Module Name: src
Committed By: msaitoh
Date: Wed Jul 25 07:55:45 UTC 2018
Modified Files:
src/sys/dev/ic: bwi.c
src/sys/dev/pci: if_txp.c
src/sys/dev/ppbus: if_plip.c
src/sys/net: bpf.c
src/sys/netisdn: i4b_ipr.c
Log Message:
Initialize some members in a mbuf which is on stack.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/bwi.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ppbus/if_plip.c
cvs rdiff -u -r1.226 -r1.227 src/sys/net/bpf.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netisdn/i4b_ipr.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/dev/ic/bwi.c
diff -u src/sys/dev/ic/bwi.c:1.34 src/sys/dev/ic/bwi.c:1.35
--- src/sys/dev/ic/bwi.c:1.34 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/bwi.c Wed Jul 25 07:55:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bwi.c,v 1.34 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: bwi.c,v 1.35 2018/07/25 07:55:44 msaitoh Exp $ */
/* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */
/*
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.34 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.35 2018/07/25 07:55:44 msaitoh Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -8529,6 +8529,7 @@ bwi_rxeof(struct bwi_softc *sc, int end_
mb.m_len = sc->sc_rxtap_len;
mb.m_next = m;
mb.m_nextpkt = NULL;
+ mb.m_owner = NULL;
mb.m_type = 0;
mb.m_flags = 0;
bpf_mtap3(sc->sc_drvbpf, &mb, BPF_D_IN);
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.49 src/sys/dev/pci/if_txp.c:1.50
--- src/sys/dev/pci/if_txp.c:1.49 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_txp.c Wed Jul 25 07:55:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.49 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_txp.c,v 1.50 2018/07/25 07:55:44 msaitoh Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.49 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.50 2018/07/25 07:55:44 msaitoh Exp $");
#include "opt_inet.h"
@@ -569,6 +569,7 @@ txp_download_fw_section(struct txp_softc
*/
m.m_type = MT_DATA;
m.m_next = m.m_nextpkt = NULL;
+ m.m_owner = NULL;
m.m_len = le32toh(sect->nbytes);
m.m_data = dma.dma_vaddr;
m.m_flags = 0;
Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.30 src/sys/dev/ppbus/if_plip.c:1.31
--- src/sys/dev/ppbus/if_plip.c:1.30 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/ppbus/if_plip.c Wed Jul 25 07:55:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.30 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_plip.c,v 1.31 2018/07/25 07:55:45 msaitoh Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.30 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.31 2018/07/25 07:55:45 msaitoh Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -523,9 +523,13 @@ lptap(struct ifnet *ifp, struct mbuf *m,
u_int32_t af = AF_INET;
struct mbuf m0;
+ m0.m_type = MT_DATA;
m0.m_next = m;
+ m0.m_nextpkt = NULL;
+ m0.m_owner = NULL;
m0.m_len = sizeof(u_int32_t);
m0.m_data = (char *)⁡
+ m0.m_flags = 0;
bpf_mtap(ifp, &m0, direction);
}
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.226 src/sys/net/bpf.c:1.227
--- src/sys/net/bpf.c:1.226 Tue Jun 26 06:48:02 2018
+++ src/sys/net/bpf.c Wed Jul 25 07:55:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.226 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: bpf.c,v 1.227 2018/07/25 07:55:45 msaitoh Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.226 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.227 2018/07/25 07:55:45 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1650,6 +1650,7 @@ _bpf_mtap2(struct bpf_if *bp, void *data
* absolutely needed--this mbuf should never go anywhere else.
*/
(void)memset(&mb, 0, sizeof(mb));
+ mb.m_type = MT_DATA;
mb.m_next = m;
mb.m_data = data;
mb.m_len = dlen;
@@ -1700,8 +1701,11 @@ _bpf_mtap_af(struct bpf_if *bp, uint32_t
{
struct mbuf m0;
+ m0.m_type = MT_DATA;
m0.m_flags = 0;
m0.m_next = m;
+ m0.m_nextpkt = NULL;
+ m0.m_owner = NULL;
m0.m_len = 4;
m0.m_data = (char *)⁡
@@ -1743,8 +1747,11 @@ _bpf_mtap_sl_out(struct bpf_if *bp, u_ch
struct mbuf m0;
u_char *hp;
+ m0.m_type = MT_DATA;
m0.m_flags = 0;
m0.m_next = m;
+ m0.m_nextpkt = NULL;
+ m0.m_owner = NULL;
m0.m_data = m0.m_dat;
m0.m_len = SLIP_HDRLEN;
Index: src/sys/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.45 src/sys/netisdn/i4b_ipr.c:1.46
--- src/sys/netisdn/i4b_ipr.c:1.45 Tue Jun 26 06:48:03 2018
+++ src/sys/netisdn/i4b_ipr.c Wed Jul 25 07:55:45 2018
@@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* ---------------------------------------------------------
*
- * $Id: i4b_ipr.c,v 1.45 2018/06/26 06:48:03 msaitoh Exp $
+ * $Id: i4b_ipr.c,v 1.46 2018/07/25 07:55:45 msaitoh Exp $
*
* $FreeBSD$
*
@@ -59,7 +59,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.45 2018/06/26 06:48:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.46 2018/07/25 07:55:45 msaitoh Exp $");
#include "irip.h"
#include "opt_irip.h"
@@ -1066,7 +1066,12 @@ error:
/* prepend the address family as a four byte field */
struct mbuf mm;
u_int af = AF_INET;
+
+ mm.m_type = MT_DATA;
+ mm.m_flags = 0;
mm.m_next = m;
+ mm.m_nextpkt = NULL;
+ mm.m_owner = NULL;
mm.m_len = 4;
mm.m_data = (char *)⁡
