Module Name: src
Committed By: christos
Date: Sat Feb 10 12:53:36 UTC 2024
Modified Files:
src/usr.bin/kdump: kdump.c
Log Message:
PR/57918: Taylor R Campbell: Don't try to print symbolically ioctls that
have bits set on the high 32 bits of a 64 bit long.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/usr.bin/kdump/kdump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.140 src/usr.bin/kdump/kdump.c:1.141
--- src/usr.bin/kdump/kdump.c:1.140 Sat Jun 19 20:25:29 2021
+++ src/usr.bin/kdump/kdump.c Sat Feb 10 07:53:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.140 2021/06/20 00:25:29 chs Exp $ */
+/* $NetBSD: kdump.c,v 1.141 2024/02/10 12:53:36 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.140 2021/06/20 00:25:29 chs Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.141 2024/02/10 12:53:36 christos Exp $");
#endif
#endif /* not lint */
@@ -580,6 +580,11 @@ ioctldecode(u_long cmd)
char dirbuf[4], *dir = dirbuf;
int c;
+ if (0xffffffff00000000ULL & cmd) {
+ output_long(cmd, 1);
+ return;
+ }
+
if (cmd & IOC_IN)
*dir++ = 'W';
if (cmd & IOC_OUT)