Merge "Replace PATH_MAX usages with smaller size" into main
diff --git a/lmkd.cpp b/lmkd.cpp
index 9b0b707..a3d553a 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -120,6 +120,8 @@
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
#define STRINGIFY_INTERNAL(x) #x
+#define PROCFS_PATH_MAX 64
+
/*
* Read lmk property with persist.device_config.lmkd_native.<name> overriding ro.lmk.<name>
* persist.device_config.lmkd_native.* properties are being set by experiments. If a new property
@@ -1029,11 +1031,11 @@
/* Reads /proc/pid/status into buf. */
static bool read_proc_status(int pid, char *buf, size_t buf_sz) {
- char path[PATH_MAX];
+ char path[PROCFS_PATH_MAX];
int fd;
ssize_t size;
- snprintf(path, PATH_MAX, "/proc/%d/status", pid);
+ snprintf(path, PROCFS_PATH_MAX, "/proc/%d/status", pid);
fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd < 0) {
return false;
@@ -1070,7 +1072,7 @@
}
static int proc_get_size(int pid) {
- char path[PATH_MAX];
+ char path[PROCFS_PATH_MAX];
char line[LINE_MAX];
int fd;
int rss = 0;
@@ -1078,7 +1080,7 @@
ssize_t ret;
/* gid containing AID_READPROC required */
- snprintf(path, PATH_MAX, "/proc/%d/statm", pid);
+ snprintf(path, PROCFS_PATH_MAX, "/proc/%d/statm", pid);
fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd == -1)
return -1;
@@ -1096,13 +1098,13 @@
}
static char *proc_get_name(int pid, char *buf, size_t buf_size) {
- char path[PATH_MAX];
+ char path[PROCFS_PATH_MAX];
int fd;
char *cp;
ssize_t ret;
/* gid containing AID_READPROC required */
- snprintf(path, PATH_MAX, "/proc/%d/cmdline", pid);
+ snprintf(path, PROCFS_PATH_MAX, "/proc/%d/cmdline", pid);
fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd == -1) {
return NULL;
@@ -1124,7 +1126,7 @@
static void cmd_procprio(LMKD_CTRL_PACKET packet, int field_count, struct ucred *cred) {
struct proc *procp;
- char path[LINE_MAX];
+ char path[PROCFS_PATH_MAX];
char val[20];
int soft_limit_mult;
struct lmk_procprio params;