From d6affa77eaf6bfba656033d05222ff8ceda05b34 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 30 Jun 2001 09:55:57 +0000 Subject: It seems struct ifnet grew, and the buffer used to kvm_read into wasn't big enough, resulting into overwriting of stack variables making wmnet core dump because of segfault. Increase buffer size to avoid that. Bump to 1.06nb2. --- net/wmnet/patches/patch-ac | 13 +++++++++++-- net/wmnet/patches/patch-af | 11 ++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) (limited to 'net/wmnet/patches') diff --git a/net/wmnet/patches/patch-ac b/net/wmnet/patches/patch-ac index 545d7f4a731..72c7efb7234 100644 --- a/net/wmnet/patches/patch-ac +++ b/net/wmnet/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.2 2000/07/31 17:24:22 tron Exp $ +$NetBSD: patch-ac,v 1.3 2001/06/30 09:55:57 wiz Exp $ --- drivers.c.orig Fri May 5 02:34:29 2000 -+++ drivers.c Mon Jul 31 19:22:21 2000 ++++ drivers.c +@@ -57,7 +57,7 @@ + #define ACCOUNT_IN_FOUND 1 + #define ACCOUNT_OUT_FOUND 2 + +-extern char buffer[256]; ++extern char buffer[2048]; + extern char *in_rule_string, *out_rule_string, *device; + extern unsigned long totalbytes_in, totalbytes_out, lastbytes_in, lastbytes_out; + extern unsigned long totalpackets_in, totalpackets_out, lastpackets_in, lastpackets_out; @@ -445,7 +445,7 @@ if (((kvmfd = kvm_open(NULL, NULL, NULL, O_RDONLY, buffer)) == NULL) || (kvm_nlist(kvmfd, symbols) < 0) || diff --git a/net/wmnet/patches/patch-af b/net/wmnet/patches/patch-af index 5d0cfd7647c..9a2b64b68bd 100644 --- a/net/wmnet/patches/patch-af +++ b/net/wmnet/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2001/03/27 02:29:18 hubertf Exp $ +$NetBSD: patch-af,v 1.2 2001/06/30 09:55:57 wiz Exp $ ---- wmnet.h.orig Sun Mar 4 02:39:16 2001 +--- wmnet.h.orig Fri May 5 03:02:26 2000 +++ wmnet.h -@@ -68,8 +68,9 @@ +@@ -68,12 +68,13 @@ Pixmap arrow; Atom delete_atom; int screen, specified_state = -1; @@ -13,3 +13,8 @@ $NetBSD: patch-af,v 1.1 2001/03/27 02:29:18 hubertf Exp $ typedef int (*parser_func)(void); /* I know statically declared buffers are against GNU coding standards, so sue me */ +-char buffer[256], *click_command = NULL, *label = NULL; ++char buffer[2048], *click_command = NULL, *label = NULL; + struct timeval timenow, timelast; + unsigned long totalbytes_in, totalbytes_out, lastbytes_in, lastbytes_out; + unsigned long totalpackets_in, totalpackets_out, lastpackets_in, lastpackets_out; -- cgit v1.2.3