1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From 8a085ea9b7f2d8e59cbf17e9c04b155fddab4dd9 Mon Sep 17 00:00:00 2001
From: Jesse Smith <jsmith@resonatingmedia.com>
Date: Tue, 3 Aug 2021 18:21:16 -0300
Subject: Applied patch from Matthias Schiffer which allows bootlogd to read
from a wider range of consoles. The console name is already passed in from
the kernel command line using "console=". We no longer filter out names as
strictly but do now check to confirm the "console=" device points to a valid
TTY.
---
src/bootlogd.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/bootlogd.c b/src/bootlogd.c
index 787db87..78e4c81 100644
--- a/src/bootlogd.c
+++ b/src/bootlogd.c
@@ -212,6 +212,22 @@ int findpty(int *master, int *slave, char *name)
return 0;
}
+
+static int istty(const char *dev)
+{
+ int fd, ret;
+
+ fd = open(dev, O_RDONLY|O_NONBLOCK);
+ if (fd < 0)
+ return 0;
+
+ ret = isatty(fd);
+
+ close(fd);
+
+ return ret;
+}
+
/*
* See if a console taken from the kernel command line maps
* to a character device we know about, and if we can open it.
@@ -228,7 +244,7 @@ int isconsole(char *s, char *res, int rlen)
l = strlen(c->cmdline);
if (sl <= l) continue;
p = s + l;
- if (strncmp(s, c->cmdline, l) != 0 || !isdigit(*p))
+ if (strncmp(s, c->cmdline, l) != 0)
continue;
for (i = 0; i < 2; i++) {
snprintf(res, rlen, i ? c->dev1 : c->dev2, p);
@@ -239,6 +255,13 @@ int isconsole(char *s, char *res, int rlen)
}
}
}
+
+ /* Fallback: accept any TTY device */
+ snprintf(res, rlen, "/dev/%s", s);
+ if ((q = strchr(res, ',')) != NULL) *q = 0;
+ if (istty(res))
+ return 1;
+
return 0;
}
--
cgit v1.1
|
