|
 |
b65758 |
From f4958b548776e8b9c9c5ef211116eb503aff8e5b Mon Sep 17 00:00:00 2001
|
|
|
b65758 |
From: Jiri Vymazal <jvymazal@redhat.com>
|
|
|
b65758 |
Date: Tue, 18 Apr 2017 16:42:22 +0200
|
|
|
b65758 |
Subject: [PATCH] Putting process name into ratelimiter with imuxsock
|
|
|
b65758 |
|
|
|
b65758 |
---
|
|
|
b65758 |
plugins/imuxsock/imuxsock.c | 25 ++++++++++++++++++++-----
|
|
|
b65758 |
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
b65758 |
|
|
|
b65758 |
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
|
|
|
b65758 |
index 277c30e..1a57f6e 100644
|
|
|
b65758 |
--- a/plugins/imuxsock/imuxsock.c
|
|
|
b65758 |
+++ b/plugins/imuxsock/imuxsock.c
|
|
|
b65758 |
@@ -594,7 +594,7 @@ findRatelimiter(lstn_t *pLstn, struct ucred *cred, ratelimit_t **prl)
|
|
|
b65758 |
ratelimit_t *rl = NULL;
|
|
|
b65758 |
int r;
|
|
|
b65758 |
pid_t *keybuf;
|
|
|
b65758 |
- char pidbuf[256];
|
|
|
b65758 |
+ char pinfobuf[512];
|
|
|
b65758 |
DEFiRet;
|
|
|
b65758 |
|
|
|
b65758 |
if(cred == NULL)
|
|
|
b65758 |
@@ -616,10 +616,25 @@ findRatelimiter(lstn_t *pLstn, struct ucred *cred, ratelimit_t **prl)
|
|
|
b65758 |
DBGPRINTF("imuxsock: no ratelimiter for pid %lu, creating one\n",
|
|
|
b65758 |
(unsigned long) cred->pid);
|
|
|
b65758 |
STATSCOUNTER_INC(ctrNumRatelimiters, mutCtrNumRatelimiters);
|
|
|
b65758 |
- snprintf(pidbuf, sizeof(pidbuf), "pid %lu",
|
|
|
b65758 |
- (unsigned long) cred->pid);
|
|
|
b65758 |
- pidbuf[sizeof(pidbuf)-1] = '\0'; /* to be on safe side */
|
|
|
b65758 |
- CHKiRet(ratelimitNew(&rl, "imuxsock", pidbuf));
|
|
|
b65758 |
+ /* read process name from system */
|
|
|
b65758 |
+ char procName[256]; /* enough for any sane process name */
|
|
|
b65758 |
+ snprintf(procName, sizeof(procName), "/proc/%lu/cmdline", (unsigned long) cred->pid);
|
|
|
b65758 |
+ FILE *f = fopen(procName, "r");
|
|
|
b65758 |
+ if (f) {
|
|
|
b65758 |
+ size_t len;
|
|
|
b65758 |
+ len = fread(procName, sizeof(char), 256, f);
|
|
|
b65758 |
+ if (len > 0) {
|
|
|
b65758 |
+ snprintf(pinfobuf, sizeof(pinfobuf), "pid: %lu, name: %s",
|
|
|
b65758 |
+ (unsigned long) cred->pid, procName);
|
|
|
b65758 |
+ }
|
|
|
b65758 |
+ fclose(f);
|
|
|
b65758 |
+ }
|
|
|
b65758 |
+ else {
|
|
|
b65758 |
+ snprintf(pinfobuf, sizeof(pinfobuf), "pid: %lu",
|
|
|
b65758 |
+ (unsigned long) cred->pid);
|
|
|
b65758 |
+ }
|
|
|
b65758 |
+ pinfobuf[sizeof(pinfobuf)-1] = '\0'; /* to be on safe side */
|
|
|
b65758 |
+ CHKiRet(ratelimitNew(&rl, "imuxsock", pinfobuf));
|
|
|
b65758 |
ratelimitSetLinuxLike(rl, pLstn->ratelimitInterval, pLstn->ratelimitBurst);
|
|
|
b65758 |
ratelimitSetSeverity(rl, pLstn->ratelimitSev);
|
|
|
b65758 |
CHKmalloc(keybuf = malloc(sizeof(pid_t)));
|