Page MenuHomeFreeBSD
Differential D29370

usr.sbin/services_mkdb: plug memory leak when line was blank.
ClosedPublic
Actions

Authored by delphij on Mar 22 2021, 2:41 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 2:02 AM
Unknown Object (File)
Fri, Mar 14, 9:45 AM
Unknown Object (File)
Fri, Mar 14, 2:59 AM
Unknown Object (File)
Thu, Mar 13, 9:59 PM
Unknown Object (File)
Mon, Feb 24, 6:24 PM
Unknown Object (File)
Feb 9 2025, 7:41 AM
Unknown Object (File)
Feb 8 2025, 8:34 AM
Unknown Object (File)
Feb 5 2025, 4:29 AM
View All 86 Files
Subscribers
imp

Details

Reviewers
emaste
kevlo
christos_netbsd.org
bapt
Commits
rG5d02b30ebd88: usr.sbin/services_mkdb: plug memory leak when line was blank.
rG18f3c5fe9207: usr.sbin/services_mkdb: plug memory leak when line was blank.
Summary

plug memory leak whe nline was blank.

Test Plan

services_mkdb -u services

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
usr.sbin/
services_mkdb/
10 lines

Diff 86587

View Options

usr.sbin/services_mkdb/uniq.c

Show All 38 Lines
#include <unistd.h> #include <unistd.h>
enum { enum {
MODE_ASLR, MODE_ASLR,
MODE_INVALID, MODE_INVALID,
MODE_TRACE, MODE_TRACE,
MODE_TRAPCAP, MODE_TRAPCAP,
MODE_PROTMAX, MODE_PROTMAX,
MODE_STACKGAP,
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
MODE_KPTI, MODE_KPTI,
#endif #endif
}; };
static pid_t static pid_t
str2pid(const char *str) str2pid(const char *str)
{ {
Show All 13 Lines
#else #else
#define KPTI_USAGE #define KPTI_USAGE
#endif #endif
static void __dead2 static void __dead2
usage(void) usage(void)
{ {
fprintf(stderr, "Usage: proccontrol -m (aslr|protmax|trace|trapcap" fprintf(stderr, "Usage: proccontrol -m (aslr|protmax|trace|trapcap|"
KPTI_USAGE") [-q] " "stackgap"KPTI_USAGE") [-q] "
"[-s (enable|disable)] [-p pid | command]\n"); "[-s (enable|disable)] [-p pid | command]\n");
exit(1); exit(1);
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int arg, ch, error, mode; int arg, ch, error, mode;
Show All 10 Lines case 'm':
if (strcmp(optarg, "aslr") == 0) if (strcmp(optarg, "aslr") == 0)
mode = MODE_ASLR; mode = MODE_ASLR;
else if (strcmp(optarg, "protmax") == 0) else if (strcmp(optarg, "protmax") == 0)
mode = MODE_PROTMAX; mode = MODE_PROTMAX;
else if (strcmp(optarg, "trace") == 0) else if (strcmp(optarg, "trace") == 0)
mode = MODE_TRACE; mode = MODE_TRACE;
else if (strcmp(optarg, "trapcap") == 0) else if (strcmp(optarg, "trapcap") == 0)
mode = MODE_TRAPCAP; mode = MODE_TRAPCAP;
else if (strcmp(optarg, "stackgap") == 0)
mode = MODE_STACKGAP;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
else if (strcmp(optarg, "kpti") == 0) else if (strcmp(optarg, "kpti") == 0)
mode = MODE_KPTI; mode = MODE_KPTI;
#endif #endif
else else
usage(); usage();
break; break;
case 's': case 's':
Show All 36 Lines case MODE_TRACE:
error = procctl(P_PID, pid, PROC_TRACE_STATUS, &arg); error = procctl(P_PID, pid, PROC_TRACE_STATUS, &arg);
break; break;
case MODE_TRAPCAP: case MODE_TRAPCAP:
error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg); error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg);
break; break;
case MODE_PROTMAX: case MODE_PROTMAX:
error = procctl(P_PID, pid, PROC_PROTMAX_STATUS, &arg); error = procctl(P_PID, pid, PROC_PROTMAX_STATUS, &arg);
break; break;
case MODE_STACKGAP:
error = procctl(P_PID, pid, PROC_STACKGAP_STATUS, &arg);
break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg); error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg);
break; break;
#endif #endif
default: default:
usage(); usage();
break; break;
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines case MODE_PROTMAX:
printf("not forced"); printf("not forced");
break; break;
} }
if ((arg & PROC_PROTMAX_ACTIVE) != 0) if ((arg & PROC_PROTMAX_ACTIVE) != 0)
printf(", active\n"); printf(", active\n");
else else
printf(", not active\n"); printf(", not active\n");
break; break;
case MODE_STACKGAP:
switch (arg) {
case PROC_STACKGAP_ENABLE:
printf("enabled\n");
break;
case PROC_STACKGAP_DISABLE:
printf("disabled\n");
break;
}
break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
switch (arg & ~PROC_KPTI_STATUS_ACTIVE) { switch (arg & ~PROC_KPTI_STATUS_ACTIVE) {
case PROC_KPTI_CTL_ENABLE_ON_EXEC: case PROC_KPTI_CTL_ENABLE_ON_EXEC:
printf("enabled"); printf("enabled");
break; break;
case PROC_KPTI_CTL_DISABLE_ON_EXEC: case PROC_KPTI_CTL_DISABLE_ON_EXEC:
printf("disabled"); printf("disabled");
Show All 22 Lines case MODE_TRAPCAP:
arg = enable ? PROC_TRAPCAP_CTL_ENABLE : arg = enable ? PROC_TRAPCAP_CTL_ENABLE :
PROC_TRAPCAP_CTL_DISABLE; PROC_TRAPCAP_CTL_DISABLE;
error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg); error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg);
break; break;
case MODE_PROTMAX: case MODE_PROTMAX:
arg = enable ? PROC_PROTMAX_FORCE_ENABLE : arg = enable ? PROC_PROTMAX_FORCE_ENABLE :
PROC_PROTMAX_FORCE_DISABLE; PROC_PROTMAX_FORCE_DISABLE;
error = procctl(P_PID, pid, PROC_PROTMAX_CTL, &arg); error = procctl(P_PID, pid, PROC_PROTMAX_CTL, &arg);
break;
case MODE_STACKGAP:
arg = enable ? PROC_STACKGAP_ENABLE :
PROC_STACKGAP_DISABLE;
error = procctl(P_PID, pid, PROC_STACKGAP_CTL, &arg);
break; break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
arg = enable ? PROC_KPTI_CTL_ENABLE_ON_EXEC : arg = enable ? PROC_KPTI_CTL_ENABLE_ON_EXEC :
PROC_KPTI_CTL_DISABLE_ON_EXEC; PROC_KPTI_CTL_DISABLE_ON_EXEC;
error = procctl(P_PID, pid, PROC_KPTI_CTL, &arg); error = procctl(P_PID, pid, PROC_KPTI_CTL, &arg);
break; break;
#endif #endif
Show All 13 Lines