diff options
Diffstat (limited to 'extra/audit/0003-all-get-rid-of-strndupa.patch')
| -rw-r--r-- | extra/audit/0003-all-get-rid-of-strndupa.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/extra/audit/0003-all-get-rid-of-strndupa.patch b/extra/audit/0003-all-get-rid-of-strndupa.patch deleted file mode 100644 index d8317e1..0000000 --- a/extra/audit/0003-all-get-rid-of-strndupa.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 38d950e468c1e51937530f884b138076e4897da2 Mon Sep 17 00:00:00 2001 -From: Tycho Andersen <tycho@docker.com> -Date: Mon, 13 Mar 2017 16:40:08 -0700 -Subject: [PATCH 3/4] all: get rid of strndupa - -in one case (src/auditd.c) we don't even need to allocate a buffer, in the -other two we do it in two steps to avoid using a non-standard function. - -Signed-off-by: Tycho Andersen <tycho@docker.com> ---- - auparse/auparse.c | 6 ++++-- - src/auditd.c | 10 +++++----- - src/ausearch-lol.c | 6 ++++-- - 3 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/auparse/auparse.c b/auparse/auparse.c -index 058f544..f61d204 100644 ---- a/auparse/auparse.c -+++ b/auparse/auparse.c -@@ -1102,10 +1102,12 @@ static int extract_timestamp(const char *b, au_event_t *e) - int rc = 1; - - e->host = NULL; -+ -+ tmp = alloca(340); - if (*b == 'n') -- tmp = strndupa(b, 340); -+ tmp = strncpy(tmp, b, 340); - else -- tmp = strndupa(b, 80); -+ tmp = strncpy(tmp, b, 80); - ptr = audit_strsplit(tmp); - if (ptr) { - // Optionally grab the node - may or may not be included -diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c -index 29d0a32..3a2e5e8 100644 ---- a/src/ausearch-lol.c -+++ b/src/ausearch-lol.c -@@ -135,10 +135,12 @@ static int extract_timestamp(const char *b, event *e) - char *ptr, *tmp, *tnode, *ttype; - - e->node = NULL; -+ -+ tmp = alloca(340); - if (*b == 'n') -- tmp = strndupa(b, 340); -+ tmp = strncpy(tmp, b, 340); - else -- tmp = strndupa(b, 80); -+ tmp = strncpy(tmp, b, 80); - ptr = audit_strsplit(tmp); - if (ptr) { - // Check to see if this is the node info --- -2.13.1 - |