Disable implicit controlling TTY.

Disable the use of implicit controlling TTYs. They will be enabled on demand. This fixes a bug where 2 or more consecutive Ctrl-C at the login prompt triggers a reboot of the device. Closes: openwrt/openwrt#11306 Signed-off-by: Markus Gothe <[email protected]>
nihilus · Oct 8, 2024 · ae268eb · ae268eb
1 parent f230c11
commit ae268eb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/inittab.c b/inittab.c
@@ -79,7 +79,7 @@ static int dev_exist(const char *dev)
 	if (dfd < 0)
 		return 0;
 
-	fd = openat(dfd, dev, O_RDONLY);
+	fd = openat(dfd, dev, O_RDONLY|O_NOCTTY);
 	close(dfd);
 
 	if (fd < 0)

diff --git a/state.c b/state.c
@@ -79,7 +79,7 @@ static void set_console(void)
 		return;
 	}
 	while (tty!=NULL) {
-		f = open(tty, O_RDONLY);
+		f = open(tty, O_RDONLY|O_NOCTTY);
 		if (f >= 0) {
 			close(f);
 			break;

diff --git a/utils/utils.c b/utils/utils.c
@@ -203,6 +203,8 @@ int patch_fd(const char *device, int fd, int flags)
 {
 	int dfd, nfd;
 
+	flags |= O_NOCTTY;
+
 	if (device == NULL)
 		device = "/dev/null";