wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-08 16:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible NULL pointer dereference

Browse Source 
When a user sets up a TTY without a device, triggering the tty->notty
code path, the tty->dev will be NULL and tty_parse_args() still return
OK result.

Found by Coverity Scan

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2025-02-23 10:30:16 +01:00
1 parent ffd01b0276
commit 9a357b7aab
1 file changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+13 -10
View File
@@ -1675,6 +1675,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
if (tty_parse_args(&tty, cmd, &args)) if (tty_parse_args(&tty, cmd, &args))
return errno; return errno;
/* NOTE: this may result in dev == NULL! */
if (tty_isatcon(tty.dev)) if (tty_isatcon(tty.dev))
dev = tty_atcon(); dev = tty_atcon();
else else
@@ -1707,17 +1708,19 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
respawn = 1; respawn = 1;
/* Create name:id tuple for identity, e.g., tty:S0 */ /* Create name:id tuple for identity, e.g., tty:S0 */
ptr = strrchr(dev, '/'); if (dev) {
if (ptr) ptr = strrchr(dev, '/');
ptr++; if (ptr)
else ptr++;
ptr = dev; else
if (!strncmp(ptr, "tty", 3)) ptr = dev;
ptr += 3; if (!strncmp(ptr, "tty", 3))
ptr += 3;
name = "tty"; name = "tty";
if (!id || id[0] == 0) if (!id || id[0] == 0)
id = ptr; id = ptr;
}
svc = svc_find_by_tty(dev); svc = svc_find_by_tty(dev);
} else } else