summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNikolay Sturm <sturm@cvs.openbsd.org>2007-05-15 19:42:47 +0000
committerNikolay Sturm <sturm@cvs.openbsd.org>2007-05-15 19:42:47 +0000
commit6b50c9ac4b6fc8f7f0274d94a7a8beeec7959cd7 (patch)
tree59b708a83e6aa098be6c6da6692d89138f1d0cfd /bin
parent411c924837277917adc0e6333223ae43187d4f16 (diff)
don't assume 4-byte aligned memory when intercepting a string
this should get rid of systrace: intercept_get_string: ioctl: Invalid argument no objections from provos, ok otto
Diffstat (limited to 'bin')
-rw-r--r--bin/systrace/intercept.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/systrace/intercept.c b/bin/systrace/intercept.c
index 1281f5ea45b..22def712e83 100644
--- a/bin/systrace/intercept.c
+++ b/bin/systrace/intercept.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intercept.c,v 1.53 2006/09/19 10:48:41 otto Exp $ */
+/* $OpenBSD: intercept.c,v 1.54 2007/05/15 19:42:46 sturm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -560,7 +560,7 @@ intercept_get_string(int fd, pid_t pid, void *addr)
/* Did the current system call get interrupted? */
if (errno == EBUSY)
return (NULL);
- if (errno != EINVAL || stride == 4) {
+ if (errno != EINVAL || stride == 1) {
warn("%s: ioctl", __func__);
return (NULL);
}