summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2019-02-03 10:48:46 +0000
committermrg <mrg@NetBSD.org>2019-02-03 10:48:46 +0000
commitf88c792336205da78bfe99720e2ae36dfa6cc734 (patch)
treee517e5ecdeb3f862e78f6a61d9dee9e4099cfb3f /dist
parent8d1866353e9a8f428a13c9cd1e41308f9ec89dae (diff)
- enlarge buffer to avoid snprintf() truncation
Diffstat (limited to 'dist')
-rw-r--r--dist/pf/sbin/pfctl/pfctl_osfp.c4
-rw-r--r--dist/pf/sbin/pflogd/privsep.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/dist/pf/sbin/pfctl/pfctl_osfp.c b/dist/pf/sbin/pfctl/pfctl_osfp.c
index 777bda039dc..a1ab8699429 100644
--- a/dist/pf/sbin/pfctl/pfctl_osfp.c
+++ b/dist/pf/sbin/pfctl/pfctl_osfp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pfctl_osfp.c,v 1.7 2008/06/18 09:06:26 yamt Exp $ */
+/* $NetBSD: pfctl_osfp.c,v 1.8 2019/02/03 10:48:47 mrg Exp $ */
/* $OpenBSD: pfctl_osfp.c,v 1.15 2006/12/13 05:10:15 itojun Exp $ */
/*
@@ -724,7 +724,7 @@ fingerprint_name_entry(struct name_list *list, char *name)
void
print_name_list(int opts, struct name_list *nml, const char *prefix)
{
- char newprefix[32];
+ char newprefix[33];
struct name_entry *nm;
LIST_FOREACH(nm, nml, nm_entry) {
diff --git a/dist/pf/sbin/pflogd/privsep.c b/dist/pf/sbin/pflogd/privsep.c
index 8303e13960a..a1fa00b875c 100644
--- a/dist/pf/sbin/pflogd/privsep.c
+++ b/dist/pf/sbin/pflogd/privsep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: privsep.c,v 1.7 2010/12/13 01:45:39 christos Exp $ */
+/* $NetBSD: privsep.c,v 1.8 2019/02/03 10:48:47 mrg Exp $ */
/* $OpenBSD: privsep.c,v 1.16 2006/10/25 20:55:04 moritz Exp $ */
/*
@@ -332,6 +332,7 @@ may_read(int fd, void *buf, size_t n)
case -1:
if (errno == EINTR || errno == EAGAIN)
continue;
+ /* FALLTHROUGH */
case 0:
return (1);
default:
@@ -355,6 +356,7 @@ must_read(int fd, void *buf, size_t n)
case -1:
if (errno == EINTR || errno == EAGAIN)
continue;
+ /* FALLTHROUGH */
case 0:
_exit(0);
default:
@@ -377,6 +379,7 @@ must_write(int fd, void *buf, size_t n)
case -1:
if (errno == EINTR || errno == EAGAIN)
continue;
+ /* FALLTHROUGH */
case 0:
_exit(0);
default: