Module Name: src
Committed By: utkarsh009
Date: Fri Oct 27 09:59:17 UTC 2017
Modified Files:
src/sys/arch/x86/x86: intr.c
src/sys/ddb: db_interface.h db_panic.c
src/sys/kern: init_main.c subr_autoconf.c subr_disk.c subr_prf.c
vfs_subr.c vfs_wapbl.c
src/sys/sys: systm.h
src/sys/ufs/ufs: ufs_lookup.c
Log Message:
[syzkaller] Attempted fix for https://github.com/google/syzkaller/issues/399
syzkaller was failing to extract constants because of the above mentioned issue
so I had to redeclare printf in sys/sys/systm.h
For more information on syzkaller, visit: https://github.com/google/syzkaller
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/x86/x86/intr.c
cvs rdiff -u -r1.33 -r1.34 src/sys/ddb/db_interface.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ddb/db_panic.c
cvs rdiff -u -r1.490 -r1.491 src/sys/kern/init_main.c
cvs rdiff -u -r1.253 -r1.254 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.119 -r1.120 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.160 -r1.161 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.468 -r1.469 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.98 -r1.99 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.272 -r1.273 src/sys/sys/systm.h
cvs rdiff -u -r1.146 -r1.147 src/sys/ufs/ufs/ufs_lookup.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/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.103 src/sys/arch/x86/x86/intr.c:1.104
--- src/sys/arch/x86/x86/intr.c:1.103 Sun Sep 3 06:24:49 2017
+++ src/sys/arch/x86/x86/intr.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.103 2017/09/03 06:24:49 cherry Exp $ */
+/* $NetBSD: intr.c,v 1.104 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.103 2017/09/03 06:24:49 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.104 2017/10/27 09:59:16 utkarsh009 Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1374,7 +1374,7 @@ intr_printconfig(void)
CPU_INFO_ITERATOR cii;
void (*pr)(const char *, ...);
- pr = printf;
+ pr = (void *)printf;
#ifdef DDB
extern int db_active;
if (db_active) {
Index: src/sys/ddb/db_interface.h
diff -u src/sys/ddb/db_interface.h:1.33 src/sys/ddb/db_interface.h:1.34
--- src/sys/ddb/db_interface.h:1.33 Wed Jan 4 21:25:41 2017
+++ src/sys/ddb/db_interface.h Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.h,v 1.33 2017/01/04 21:25:41 christos Exp $ */
+/* $NetBSD: db_interface.h,v 1.34 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -75,6 +75,6 @@ void db_show_all_vmems(db_expr_t, bool,
#define db_stacktrace() \
db_stack_trace_print((db_expr_t)(intptr_t)__builtin_frame_address(0), \
- true, 65535, "", printf)
+ true, 65535, "", (void *)printf)
#endif /* _DDB_DB_INTERFACE_H_ */
Index: src/sys/ddb/db_panic.c
diff -u src/sys/ddb/db_panic.c:1.3 src/sys/ddb/db_panic.c:1.4
--- src/sys/ddb/db_panic.c:1.3 Wed Jan 22 15:20:40 2014
+++ src/sys/ddb/db_panic.c Fri Oct 27 09:59:16 2017
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_panic.c,v 1.3 2014/01/22 15:20:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_panic.c,v 1.4 2017/10/27 09:59:16 utkarsh009 Exp $");
#include <sys/types.h>
#include <sys/cpu.h>
@@ -52,7 +52,7 @@ void db_panic(void)
cpu_index(curcpu()));
db_stack_trace_print(
(db_expr_t)(intptr_t)__builtin_frame_address(0),
- true, 65535, "", printf);
+ true, 65535, "", (void *)printf);
printf("cpu%u: End traceback...\n",
cpu_index(curcpu()));
intrace = 0;
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.490 src/sys/kern/init_main.c:1.491
--- src/sys/kern/init_main.c:1.490 Mon Jan 16 09:28:40 2017
+++ src/sys/kern/init_main.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.490 2017/01/16 09:28:40 ryo Exp $ */
+/* $NetBSD: init_main.c,v 1.491 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.490 2017/01/16 09:28:40 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.491 2017/10/27 09:59:16 utkarsh009 Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -1117,7 +1117,7 @@ banner(void)
printf_nolog("%s\n", notice);
pr = aprint_normal;
} else {
- pr = printf;
+ pr = (void *)printf;
}
memset(pbuf, 0, sizeof(pbuf));
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.253 src/sys/kern/subr_autoconf.c:1.254
--- src/sys/kern/subr_autoconf.c:1.253 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/subr_autoconf.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.253 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.254 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.253 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.254 2017/10/27 09:59:16 utkarsh009 Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -258,7 +258,7 @@ frob_cfdrivervec(struct cfdriver * const
const char *style, bool dopanic)
{
void (*pr)(const char *, ...) __printflike(1, 2) =
- dopanic ? panic : printf;
+ dopanic ? panic : (void *)printf;
int i, error = 0, e2 __diagused;
for (i = 0; cfdriverv[i] != NULL; i++) {
@@ -290,7 +290,7 @@ frob_cfattachvec(const struct cfattachin
{
const struct cfattachinit *cfai = NULL;
void (*pr)(const char *, ...) __printflike(1, 2) =
- dopanic ? panic : printf;
+ dopanic ? panic : (void *)printf;
int j = 0, error = 0, e2 __diagused;
for (cfai = &cfattachv[0]; cfai->cfai_name != NULL; cfai++) {
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.119 src/sys/kern/subr_disk.c:1.120
--- src/sys/kern/subr_disk.c:1.119 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/subr_disk.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.119 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: subr_disk.c,v 1.120 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.119 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.120 2017/10/27 09:59:16 utkarsh009 Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -138,7 +138,7 @@ diskerr(const struct buf *bp, const char
log(pri, fmt);
pr = addlog;
} else
- pr = printf;
+ pr = (void *)printf;
(*pr)("%s%d%c: %s %sing fsbn ", dname, unit, partname, what,
bp->b_flags & B_READ ? "read" : "writ");
sn = bp->b_blkno;
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.160 src/sys/kern/subr_prf.c:1.161
--- src/sys/kern/subr_prf.c:1.160 Wed Jul 27 09:57:26 2016
+++ src/sys/kern/subr_prf.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.160 2016/07/27 09:57:26 skrll Exp $ */
+/* $NetBSD: subr_prf.c,v 1.161 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.160 2016/07/27 09:57:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.161 2017/10/27 09:59:16 utkarsh009 Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1032,7 +1032,7 @@ printf_nolog(const char *fmt, ...)
/*
* printf: print a message to the console and the log
*/
-void
+int
printf(const char *fmt, ...)
{
va_list ap;
@@ -1047,6 +1047,7 @@ printf(const char *fmt, ...)
if (!panicstr)
logwakeup();
+ return 0;
}
/*
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.468 src/sys/kern/vfs_subr.c:1.469
--- src/sys/kern/vfs_subr.c:1.468 Sun Jun 4 07:58:29 2017
+++ src/sys/kern/vfs_subr.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.468 2017/06/04 07:58:29 hannken Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.469 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.468 2017/06/04 07:58:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.469 2017/10/27 09:59:16 utkarsh009 Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1131,7 +1131,7 @@ vprint(const char *label, struct vnode *
if (label != NULL)
printf("%s: ", label);
- vprint_common(vp, "\t", printf);
+ vprint_common(vp, "\t", (void *)printf);
if (vp->v_data != NULL) {
printf("\t");
VOP_PRINT(vp);
@@ -1512,7 +1512,7 @@ vfs_vnode_print(struct vnode *vp, int fu
uvm_object_printit(&vp->v_uobj, full, pr);
(*pr)("\n");
- vprint_common(vp, "", printf);
+ vprint_common(vp, "", (void *)printf);
if (full) {
struct buf *bp;
Index: src/sys/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.98 src/sys/kern/vfs_wapbl.c:1.99
--- src/sys/kern/vfs_wapbl.c:1.98 Mon Oct 23 19:03:40 2017
+++ src/sys/kern/vfs_wapbl.c Fri Oct 27 09:59:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.98 2017/10/23 19:03:40 jdolecek Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.99 2017/10/27 09:59:16 utkarsh009 Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.98 2017/10/23 19:03:40 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.99 2017/10/27 09:59:16 utkarsh009 Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -2167,7 +2167,7 @@ wapbl_dump(struct wapbl *wl)
#endif
if (!wl)
return;
- wapbl_print(wl, 1, printf);
+ wapbl_print(wl, 1, (void *)printf);
}
#endif
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.272 src/sys/sys/systm.h:1.273
--- src/sys/sys/systm.h:1.272 Thu Dec 22 16:05:15 2016
+++ src/sys/sys/systm.h Fri Oct 27 09:59:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.272 2016/12/22 16:05:15 cherry Exp $ */
+/* $NetBSD: systm.h,v 1.273 2017/10/27 09:59:17 utkarsh009 Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -221,7 +221,7 @@ void printf_tolog(const char *, ...) __p
void printf_nolog(const char *, ...) __printflike(1, 2);
-void printf(const char *, ...) __printflike(1, 2);
+int printf(const char *, ...) __printflike(1, 2);
int snprintf(char *, size_t, const char *, ...) __printflike(3, 4);
Index: src/sys/ufs/ufs/ufs_lookup.c
diff -u src/sys/ufs/ufs/ufs_lookup.c:1.146 src/sys/ufs/ufs/ufs_lookup.c:1.147
--- src/sys/ufs/ufs/ufs_lookup.c:1.146 Thu Mar 30 09:11:45 2017
+++ src/sys/ufs/ufs/ufs_lookup.c Fri Oct 27 09:59:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_lookup.c,v 1.146 2017/03/30 09:11:45 hannken Exp $ */
+/* $NetBSD: ufs_lookup.c,v 1.147 2017/10/27 09:59:17 utkarsh009 Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.146 2017/03/30 09:11:45 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.147 2017/10/27 09:59:17 utkarsh009 Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@@ -700,7 +700,7 @@ ufs_dirbad(struct inode *ip, doff_t offs
{
struct mount *mp = ITOV(ip)->v_mount;
void (*p)(const char *, ...) __printflike(1, 2) =
- (mp->mnt_flag & MNT_RDONLY) == 0 ? panic : printf;
+ (mp->mnt_flag & MNT_RDONLY) == 0 ? panic : (void *)printf;
(*p)("%s: bad dir ino %ju at offset %d: %s\n",
mp->mnt_stat.f_mntonname, (uintmax_t)ip->i_number,
