Compare commits
No commits in common. 'c8' and 'c9' have entirely different histories.
@ -1 +1 @@
|
|||||||
SOURCES/logrotate-3.14.0.tar.xz
|
SOURCES/logrotate-3.18.0.tar.xz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
10416a3aaea4fbf6c1a01858f2fb994e132c4127 SOURCES/logrotate-3.14.0.tar.xz
|
6b9aa5efd4551377e9869e8d3303d90a946566f6 SOURCES/logrotate-3.18.0.tar.xz
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
From b0d067cfba64956893fc095bb37f8c767f5a910e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Mon, 6 Aug 2018 17:13:31 +0200
|
|
||||||
Subject: [PATCH] logrotate.8: document the --version option
|
|
||||||
|
|
||||||
The man page now covers all the options that are listed
|
|
||||||
by `logrotate --help`.
|
|
||||||
|
|
||||||
Bug: https://bugzilla.redhat.com/1611498
|
|
||||||
|
|
||||||
Upstream-commit: 4088ef987df2ec48cc3d968eb87ad27c840fa2d8
|
|
||||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
---
|
|
||||||
logrotate.8.in | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/logrotate.8.in b/logrotate.8.in
|
|
||||||
index 004229e..5ef09c5 100644
|
|
||||||
--- a/logrotate.8.in
|
|
||||||
+++ b/logrotate.8.in
|
|
||||||
@@ -87,6 +87,10 @@ Prints a short usage message.
|
|
||||||
\fB\-v\fR, \fB\-\-verbose\fR
|
|
||||||
Turns on verbose mode, for example to display messages during rotation.
|
|
||||||
|
|
||||||
+.TP
|
|
||||||
+\fB\-\-version\fR
|
|
||||||
+Display version information.
|
|
||||||
+
|
|
||||||
.SH CONFIGURATION FILE
|
|
||||||
|
|
||||||
\fBlogrotate\fR reads everything about the log files it should be handling
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -0,0 +1,615 @@
|
|||||||
|
From 471cf0a6a90e5d45f116f404e1276ea730dbece6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Fri, 26 Mar 2021 17:18:09 +0100
|
||||||
|
Subject: [PATCH 1/9] Do not report OOM incorrectly
|
||||||
|
|
||||||
|
In case there is no file in the set to rotate `calloc(0, ...)` is called
|
||||||
|
, which might return NULL.
|
||||||
|
|
||||||
|
Order the check for a zero number of files first, to void calling calloc
|
||||||
|
with a size of zero.
|
||||||
|
|
||||||
|
Upstream-commit: 7b65b267d73970eb59061be907c8c35b4396ada9
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 12 ++++++------
|
||||||
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index 507c85a..a8c8480 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -2212,11 +2212,6 @@ static int rotateLogSet(const struct logInfo *log, int force)
|
||||||
|
struct logState **state;
|
||||||
|
struct logNames **rotNames;
|
||||||
|
|
||||||
|
- logHasErrors = calloc(log->numFiles, sizeof(int));
|
||||||
|
- if (!logHasErrors) {
|
||||||
|
- message_OOM();
|
||||||
|
- return 1;
|
||||||
|
- }
|
||||||
|
message(MESS_DEBUG, "\nrotating pattern: %s ", log->pattern);
|
||||||
|
if (force) {
|
||||||
|
message(MESS_DEBUG, "forced from command line ");
|
||||||
|
@@ -2277,10 +2272,15 @@ static int rotateLogSet(const struct logInfo *log, int force)
|
||||||
|
|
||||||
|
if (log->numFiles == 0) {
|
||||||
|
message(MESS_DEBUG, "No logs found. Rotation not needed.\n");
|
||||||
|
- free(logHasErrors);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ logHasErrors = calloc(log->numFiles, sizeof(int));
|
||||||
|
+ if (!logHasErrors) {
|
||||||
|
+ message_OOM();
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (log->flags & LOG_FLAG_SU) {
|
||||||
|
if (switch_user(log->suUid, log->suGid) != 0) {
|
||||||
|
free(logHasErrors);
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From 96203f4cdc64e2df3d203231bd1247424a20875e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Mon, 19 Apr 2021 15:35:37 +0200
|
||||||
|
Subject: [PATCH 2/9] Unify asprintf usage
|
||||||
|
|
||||||
|
Unify the error checking of asprintf(3).
|
||||||
|
|
||||||
|
Also reset the target string pointer to NULL on error, if it is non-
|
||||||
|
local, since the content is undefined according to the specification.
|
||||||
|
|
||||||
|
Also fix potential NULL-pointer usage in sprintf(3):
|
||||||
|
|
||||||
|
logrotate.c:1595:
|
||||||
|
rotNames->dirName = malloc(strlen(ld) + strlen(log->oldDir) + 2);
|
||||||
|
sprintf(rotNames->dirName, "%s/%s", ld, log->oldDir);
|
||||||
|
|
||||||
|
Upstream-commit: 5afcdeecc5a3bfe07671a3c05c7a301da9206ccd
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
config.c | 28 +++++++++++++---------------
|
||||||
|
logrotate.c | 9 ++++++---
|
||||||
|
2 files changed, 19 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.c b/config.c
|
||||||
|
index df2d90b..19dcfce 100644
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -815,21 +815,19 @@ int readAllConfigPaths(const char **paths)
|
||||||
|
|
||||||
|
|
||||||
|
for (i = 0; i < defTabooCount; i++) {
|
||||||
|
- int bytes;
|
||||||
|
char *pattern = NULL;
|
||||||
|
|
||||||
|
/* generate a pattern by concatenating star (wildcard) to the
|
||||||
|
* suffix literal
|
||||||
|
*/
|
||||||
|
- bytes = asprintf(&pattern, "*%s", defTabooExts[i]);
|
||||||
|
- if (bytes != -1) {
|
||||||
|
- tabooPatterns[i] = pattern;
|
||||||
|
- tabooCount++;
|
||||||
|
- } else {
|
||||||
|
+ if (asprintf(&pattern, "*%s", defTabooExts[i]) < 0) {
|
||||||
|
free_2d_array(tabooPatterns, tabooCount);
|
||||||
|
message_OOM();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ tabooPatterns[i] = pattern;
|
||||||
|
+ tabooCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (file = paths; *file; file++) {
|
||||||
|
@@ -1421,7 +1419,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
}
|
||||||
|
|
||||||
|
while (*endtag) {
|
||||||
|
- int bytes;
|
||||||
|
char *pattern = NULL;
|
||||||
|
|
||||||
|
chptr = endtag;
|
||||||
|
@@ -1437,10 +1434,11 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
RAISE_ERROR();
|
||||||
|
}
|
||||||
|
tabooPatterns = tmp;
|
||||||
|
- bytes = asprintf(&pattern, "*%.*s", (int)(chptr - endtag), endtag);
|
||||||
|
+ if (asprintf(&pattern, "*%.*s", (int)(chptr - endtag), endtag) < 0) {
|
||||||
|
+ message_OOM();
|
||||||
|
+ RAISE_ERROR();
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- /* should test for malloc() failure */
|
||||||
|
- assert(bytes != -1);
|
||||||
|
tabooPatterns[tabooCount] = pattern;
|
||||||
|
tabooCount++;
|
||||||
|
}
|
||||||
|
@@ -1481,7 +1479,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
}
|
||||||
|
|
||||||
|
while (*endtag) {
|
||||||
|
- int bytes;
|
||||||
|
char *pattern = NULL;
|
||||||
|
char **tmp;
|
||||||
|
|
||||||
|
@@ -1496,10 +1493,11 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
RAISE_ERROR();
|
||||||
|
}
|
||||||
|
tabooPatterns = tmp;
|
||||||
|
- bytes = asprintf(&pattern, "%.*s", (int)(chptr - endtag), endtag);
|
||||||
|
+ if (asprintf(&pattern, "%.*s", (int)(chptr - endtag), endtag) < 0) {
|
||||||
|
+ message_OOM();
|
||||||
|
+ RAISE_ERROR();
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- /* should test for malloc() failure */
|
||||||
|
- assert(bytes != -1);
|
||||||
|
tabooPatterns[tabooCount] = pattern;
|
||||||
|
tabooCount++;
|
||||||
|
|
||||||
|
@@ -1540,7 +1538,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
env_home = pwd->pw_dir;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (asprintf(&new_key, "%s/%s", env_home, key + 2) == -1) {
|
||||||
|
+ if (asprintf(&new_key, "%s/%s", env_home, key + 2) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
RAISE_ERROR();
|
||||||
|
}
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index a8c8480..e294352 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -1576,9 +1576,9 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
ld = dirname(logpath);
|
||||||
|
if (log->oldDir) {
|
||||||
|
if (log->oldDir[0] != '/') {
|
||||||
|
- rotNames->dirName =
|
||||||
|
- malloc(strlen(ld) + strlen(log->oldDir) + 2);
|
||||||
|
- sprintf(rotNames->dirName, "%s/%s", ld, log->oldDir);
|
||||||
|
+ if (asprintf(&rotNames->dirName, "%s/%s", ld, log->oldDir) < 0) {
|
||||||
|
+ rotNames->dirName = NULL;
|
||||||
|
+ }
|
||||||
|
} else
|
||||||
|
rotNames->dirName = strdup(log->oldDir);
|
||||||
|
} else
|
||||||
|
@@ -1983,6 +1983,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
if (asprintf(&(rotNames->finalName), "%s/%s%s%s", rotNames->dirName,
|
||||||
|
rotNames->baseName, dext_str, fileext) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
+ rotNames->finalName = NULL;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (asprintf(&destFile, "%s%s", rotNames->finalName, compext) < 0) {
|
||||||
|
@@ -2001,6 +2002,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
if (asprintf(&(rotNames->finalName), "%s/%s.%d%s", rotNames->dirName,
|
||||||
|
rotNames->baseName, logStart, fileext) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
+ rotNames->finalName = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2084,6 +2086,7 @@ static int rotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
free(rotNames->disposeName);
|
||||||
|
if (asprintf(&rotNames->disposeName, "%s%s", rotNames->finalName, ext) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
+ rotNames->disposeName = NULL;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From 3cf921e0d58993b064cd6d52b44835008345f498 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Mon, 19 Apr 2021 15:40:19 +0200
|
||||||
|
Subject: [PATCH 3/9] Update custom asprintf implementation
|
||||||
|
|
||||||
|
Check for vsnprintf(3) failures.
|
||||||
|
|
||||||
|
Silence conversion warnings.
|
||||||
|
|
||||||
|
Do not call exit(2) on allocation failure, but return -1 like the
|
||||||
|
specification says. All callers check the return value, since they
|
||||||
|
need to handle standard asprintf(3) implementations.
|
||||||
|
|
||||||
|
Upstream-commit: f917b31dbb47992bf5c5342c7312ddb2e64efc40
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
config.c | 20 ++++++++------------
|
||||||
|
1 file changed, 8 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.c b/config.c
|
||||||
|
index 19dcfce..0d79980 100644
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -61,24 +61,20 @@ int asprintf(char **string_ptr, const char *format, ...)
|
||||||
|
|
||||||
|
va_start(arg, format);
|
||||||
|
size = vsnprintf(NULL, 0, format, arg);
|
||||||
|
- size++;
|
||||||
|
va_end(arg);
|
||||||
|
- va_start(arg, format);
|
||||||
|
- str = malloc(size);
|
||||||
|
+ if (size < 0) {
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+ str = malloc((size_t)size + 1);
|
||||||
|
if (str == NULL) {
|
||||||
|
- va_end(arg);
|
||||||
|
- /*
|
||||||
|
- * Strictly speaking, GNU asprintf doesn't do this,
|
||||||
|
- * but the caller isn't checking the return value.
|
||||||
|
- */
|
||||||
|
- message_OOM();
|
||||||
|
- exit(1);
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
- rv = vsnprintf(str, size, format, arg);
|
||||||
|
+ va_start(arg, format);
|
||||||
|
+ rv = vsnprintf(str, (size_t)size + 1, format, arg);
|
||||||
|
va_end(arg);
|
||||||
|
|
||||||
|
*string_ptr = str;
|
||||||
|
- return (rv);
|
||||||
|
+ return rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From ace9818a606a0c96bb6e4da479ed151650b8fa3a Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Mon, 19 Apr 2021 15:45:55 +0200
|
||||||
|
Subject: [PATCH 4/9] Use asprintf instead of split malloc + sprintf
|
||||||
|
|
||||||
|
Use asprintf(3) instead of split usage of malloc(3) and sprintf(3) to
|
||||||
|
reduce the chance of potential size inconsistencies.
|
||||||
|
|
||||||
|
Upstream-commit: 001352baa924f021748513b6d09d37eca754d5cc
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
config.c | 5 ++---
|
||||||
|
logrotate.c | 25 ++++++++++++-------------
|
||||||
|
2 files changed, 14 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.c b/config.c
|
||||||
|
index 0d79980..2905ff7 100644
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -1886,13 +1886,12 @@ duperror:
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- ld = malloc(strlen(dirName) + strlen(newlog->oldDir) + 2);
|
||||||
|
- if (ld == NULL) {
|
||||||
|
+ if (asprintf(&ld, "%s/%s", dirName, newlog->oldDir) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
free(dirpath);
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
- sprintf(ld, "%s/%s", dirName, newlog->oldDir);
|
||||||
|
+
|
||||||
|
free(dirpath);
|
||||||
|
|
||||||
|
if (newlog->oldDir[0] != '/') {
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index e294352..a72329e 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -1810,15 +1810,6 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* adding 2 due to / and \0 being added by snprintf */
|
||||||
|
- rotNames->firstRotated =
|
||||||
|
- malloc(strlen(rotNames->dirName) + strlen(rotNames->baseName) +
|
||||||
|
- strlen(fileext) + strlen(compext) + DATEEXT_LEN + 2 );
|
||||||
|
- if (rotNames->firstRotated == NULL) {
|
||||||
|
- message_OOM();
|
||||||
|
- return 1;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
if (log->flags & LOG_FLAG_DATEEXT) {
|
||||||
|
/* glob for compressed files with our pattern
|
||||||
|
* and compress ext */
|
||||||
|
@@ -1882,9 +1873,13 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
rotNames->disposeName = NULL;
|
||||||
|
}
|
||||||
|
/* firstRotated is most recently created/compressed rotated log */
|
||||||
|
- sprintf(rotNames->firstRotated, "%s/%s%s%s%s",
|
||||||
|
+ if (asprintf(&rotNames->firstRotated, "%s/%s%s%s%s",
|
||||||
|
rotNames->dirName, rotNames->baseName, dext_str, fileext,
|
||||||
|
- (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
|
||||||
|
+ (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext) < 0) {
|
||||||
|
+ message_OOM();
|
||||||
|
+ rotNames->firstRotated = NULL;
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
globfree(&globResult);
|
||||||
|
free(glob_pattern);
|
||||||
|
} else {
|
||||||
|
@@ -1915,9 +1910,13 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- sprintf(rotNames->firstRotated, "%s/%s.%d%s%s", rotNames->dirName,
|
||||||
|
+ if (asprintf(&rotNames->firstRotated, "%s/%s.%d%s%s", rotNames->dirName,
|
||||||
|
rotNames->baseName, logStart, fileext,
|
||||||
|
- (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
|
||||||
|
+ (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext) < 0) {
|
||||||
|
+ message_OOM();
|
||||||
|
+ rotNames->firstRotated = NULL;
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
for (i = rotateCount + logStart - 1; (i >= 0) && !hasErrors; i--) {
|
||||||
|
free(newName);
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From e8a655ef1977add152d79c4dc8148fe7b1c9bca2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Mon, 19 Apr 2021 17:52:48 +0200
|
||||||
|
Subject: [PATCH 5/9] Mark read-only string variable const
|
||||||
|
|
||||||
|
Prevent it accidentally being passed to free(3) or similar.
|
||||||
|
|
||||||
|
Upstream-commit: 2231aba823ff6e5a18d996e81ef63df0871224dd
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index a72329e..7d49261 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -1567,7 +1567,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
state->lastRotated = now;
|
||||||
|
|
||||||
|
{
|
||||||
|
- char *ld;
|
||||||
|
+ const char *ld;
|
||||||
|
char *logpath = strdup(log->files[logNum]);
|
||||||
|
if (logpath == NULL) {
|
||||||
|
message_OOM();
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From c06f20f781c74b2256e8f1757433db7e043b4ddf Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Mon, 19 Apr 2021 17:59:21 +0200
|
||||||
|
Subject: [PATCH 6/9] Limit scope of variable
|
||||||
|
|
||||||
|
Limit the scope of a variable, by splitting it into several distinct
|
||||||
|
block scope variables.
|
||||||
|
|
||||||
|
This makes some asprintf(3) calls obsolete, and improves readability by
|
||||||
|
splitting the purpose of the variable.
|
||||||
|
|
||||||
|
Upstream-commit: b37fb75f569b3ddde30dd85184ea160f63abb7d5
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 19 ++++++++-----------
|
||||||
|
1 file changed, 8 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index 7d49261..962ac55 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -1529,7 +1529,6 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
struct logState *state, struct logNames *rotNames)
|
||||||
|
{
|
||||||
|
struct tm now;
|
||||||
|
- char *oldName = NULL;
|
||||||
|
const char *compext = "";
|
||||||
|
const char *fileext = "";
|
||||||
|
int hasErrors = 0;
|
||||||
|
@@ -1770,11 +1769,8 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
sortGlobResult(&globResult, strlen(rotNames->dirName) + 1 + strlen(rotNames->baseName), dformat);
|
||||||
|
for (glob_count = 0; glob_count < globResult.gl_pathc && !hasErrors; glob_count++) {
|
||||||
|
struct stat sbprev;
|
||||||
|
+ const char *oldName = globResult.gl_pathv[glob_count];
|
||||||
|
|
||||||
|
- if (asprintf(&oldName, "%s", (globResult.gl_pathv)[glob_count]) < 0) {
|
||||||
|
- message_OOM();
|
||||||
|
- return 1;
|
||||||
|
- }
|
||||||
|
if (stat(oldName, &sbprev)) {
|
||||||
|
if (errno == ENOENT)
|
||||||
|
message(MESS_DEBUG, "previous log %s does not exist\n", oldName);
|
||||||
|
@@ -1783,7 +1779,6 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
} else {
|
||||||
|
hasErrors = compressLogFile(oldName, log, &sbprev);
|
||||||
|
}
|
||||||
|
- free(oldName);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
message(MESS_DEBUG,
|
||||||
|
@@ -1793,6 +1788,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
free(glob_pattern);
|
||||||
|
} else {
|
||||||
|
struct stat sbprev;
|
||||||
|
+ char *oldName;
|
||||||
|
if (asprintf(&oldName, "%s/%s.%d%s", rotNames->dirName,
|
||||||
|
rotNames->baseName, logStart, fileext) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
@@ -1853,16 +1849,14 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
}
|
||||||
|
if (mail_out != (size_t)-1) {
|
||||||
|
/* oldName is oldest Backup found (for unlink later) */
|
||||||
|
- if (asprintf(&oldName, "%s", (globResult.gl_pathv)[mail_out]) < 0) {
|
||||||
|
- message_OOM();
|
||||||
|
- return 1;
|
||||||
|
- }
|
||||||
|
+ const char *oldName = globResult.gl_pathv[mail_out];
|
||||||
|
rotNames->disposeName = strdup(oldName);
|
||||||
|
if (rotNames->disposeName == NULL) {
|
||||||
|
message_OOM();
|
||||||
|
+ globfree(&globResult);
|
||||||
|
+ free(glob_pattern);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
- free(oldName);
|
||||||
|
} else {
|
||||||
|
free(rotNames->disposeName);
|
||||||
|
rotNames->disposeName = NULL;
|
||||||
|
@@ -1878,6 +1872,8 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
(log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
rotNames->firstRotated = NULL;
|
||||||
|
+ globfree(&globResult);
|
||||||
|
+ free(glob_pattern);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
globfree(&globResult);
|
||||||
|
@@ -1885,6 +1881,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
} else {
|
||||||
|
int i;
|
||||||
|
char *newName = NULL;
|
||||||
|
+ char *oldName;
|
||||||
|
|
||||||
|
if (rotateCount == -1) {
|
||||||
|
rotateCount = findLastRotated(rotNames, fileext, compext);
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From 1a1eb69e6c4ae403edceb411cb0bbc80473e2527 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Tue, 20 Apr 2021 17:41:16 +0200
|
||||||
|
Subject: [PATCH 7/9] Free memory on noolddir configuration
|
||||||
|
|
||||||
|
Consider the following configuration:
|
||||||
|
olddir /var/log/foo
|
||||||
|
noolddir
|
||||||
|
|
||||||
|
Do not leak the memory of the initial olddir path.
|
||||||
|
|
||||||
|
Upstream-commit: 59e8e321d3221a3beaf7b9c99b17d5cb7dbcfaf0
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
config.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/config.c b/config.c
|
||||||
|
index 2905ff7..b7406f5 100644
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -1134,7 +1134,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
if (newlog->dateformat == NULL)
|
||||||
|
continue;
|
||||||
|
} else if (!strcmp(key, "noolddir")) {
|
||||||
|
- newlog->oldDir = NULL;
|
||||||
|
+ freeLogItem(oldDir);
|
||||||
|
} else if (!strcmp(key, "mailfirst")) {
|
||||||
|
newlog->flags |= LOG_FLAG_MAILFIRST;
|
||||||
|
} else if (!strcmp(key, "maillast")) {
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From 4aabfd0fe19832ba1df8919356d1d2d4b463937d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Mon, 3 May 2021 15:14:09 +0200
|
||||||
|
Subject: [PATCH 8/9] readConfigFile: release `globerr_msg` on all code paths
|
||||||
|
|
||||||
|
This eliminates the following reports by Coverity:
|
||||||
|
|
||||||
|
Error: RESOURCE_LEAK (CWE-772):
|
||||||
|
logrotate-3.18.0.18_7a4d/config.c:1798: alloc_arg: "asprintf" allocates memory that is stored into "globerr_msg". [Note: The source code implementation of the function has been overridden by a builtin model.]
|
||||||
|
logrotate-3.18.0.18_7a4d/config.c:2116: leaked_storage: Variable "globerr_msg" going out of scope leaks the storage it points to.
|
||||||
|
|
||||||
|
Error: RESOURCE_LEAK (CWE-772):
|
||||||
|
logrotate-3.18.0.18_7a4d/config.c:1798: alloc_arg: "asprintf" allocates memory that is stored into "globerr_msg". [Note: The source code implementation of the function has been overridden by a builtin model.]
|
||||||
|
logrotate-3.18.0.18_7a4d/config.c:2122: leaked_storage: Variable "globerr_msg" going out of scope leaks the storage it points to.
|
||||||
|
|
||||||
|
Closes: https://github.com/logrotate/logrotate/pull/387
|
||||||
|
|
||||||
|
Upstream-commit: 97f841be2bb52b9ac00cd564a6eb0a853d1017bd
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
config.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.c b/config.c
|
||||||
|
index b7406f5..91fd412 100644
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -2086,12 +2086,14 @@ next_state: ;
|
||||||
|
|
||||||
|
munmap(buf, length);
|
||||||
|
close(fd);
|
||||||
|
+ free(globerr_msg);
|
||||||
|
return logerror;
|
||||||
|
error:
|
||||||
|
/* free is a NULL-safe operation */
|
||||||
|
free(key);
|
||||||
|
munmap(buf, length);
|
||||||
|
close(fd);
|
||||||
|
+ free(globerr_msg);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
|
From b5610cd1b0bc2cf9ab887007a953fbf6340cb150 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Mon, 3 May 2021 15:17:59 +0200
|
||||||
|
Subject: [PATCH 9/9] prerotateSingleLog: release `oldName` on all code paths
|
||||||
|
|
||||||
|
This eliminates the following reports by Coverity:
|
||||||
|
|
||||||
|
Error: RESOURCE_LEAK (CWE-772):
|
||||||
|
logrotate-3.18.0.18_7a4d/logrotate.c:1911: alloc_arg: "asprintf" allocates memory that is stored into "oldName". [Note: The source code implementation of the function has been overridden by a builtin model.]
|
||||||
|
logrotate-3.18.0.18_7a4d/logrotate.c:1919: noescape: Resource "oldName" is not freed or pointed-to in "strdup".
|
||||||
|
logrotate-3.18.0.18_7a4d/logrotate.c:1922: leaked_storage: Variable "oldName" going out of scope leaks the storage it points to.
|
||||||
|
|
||||||
|
Error: RESOURCE_LEAK (CWE-772):
|
||||||
|
logrotate-3.18.0.18_7a4d/logrotate.c:1911: alloc_arg: "asprintf" allocates memory that is stored into "oldName". [Note: The source code implementation of the function has been overridden by a builtin model.]
|
||||||
|
logrotate-3.18.0.18_7a4d/logrotate.c:1919: noescape: Resource "oldName" is not freed or pointed-to in "strdup".
|
||||||
|
logrotate-3.18.0.18_7a4d/logrotate.c:1931: leaked_storage: Variable "oldName" going out of scope leaks the storage it points to.
|
||||||
|
|
||||||
|
Closes: https://github.com/logrotate/logrotate/pull/387
|
||||||
|
|
||||||
|
Upstream-commit: 85bc130b19344a3d9c8b472142df14ddcd0a166d
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index 962ac55..d3f2825 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -1903,6 +1903,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
rotNames->disposeName = strdup(oldName);
|
||||||
|
if (rotNames->disposeName == NULL) {
|
||||||
|
message_OOM();
|
||||||
|
+ free(oldName);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1911,6 +1912,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
|
||||||
|
rotNames->baseName, logStart, fileext,
|
||||||
|
(log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext) < 0) {
|
||||||
|
message_OOM();
|
||||||
|
+ free(oldName);
|
||||||
|
rotNames->firstRotated = NULL;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
@ -1,630 +0,0 @@
|
|||||||
From a4ac21e9a8cfe8a73471a195308a742e07d7fe8d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Wed, 1 Aug 2018 15:32:38 +0200
|
|
||||||
Subject: [PATCH 1/3] readConfigFile: assign and check 'key' separately
|
|
||||||
|
|
||||||
... to make the code readable. No changes in behavior intended
|
|
||||||
by this commit.
|
|
||||||
---
|
|
||||||
config.c | 312 +++++++++++++++++++++++++++----------------------------
|
|
||||||
1 file changed, 152 insertions(+), 160 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.c b/config.c
|
|
||||||
index 84db36f..d2fba10 100644
|
|
||||||
--- a/config.c
|
|
||||||
+++ b/config.c
|
|
||||||
@@ -1037,7 +1037,8 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isalpha((unsigned char)*start)) {
|
|
||||||
- if ((key = isolateWord(&start, &buf, length)) == NULL)
|
|
||||||
+ key = isolateWord(&start, &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
continue;
|
|
||||||
if (!strcmp(key, "compress")) {
|
|
||||||
newlog->flags |= LOG_FLAG_COMPRESS;
|
|
||||||
@@ -1191,16 +1192,16 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
}
|
|
||||||
} else if (!strcmp(key, "shredcycles")) {
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue(configFile, lineNum, "shred cycles",
|
|
||||||
- &start, &buf, length)) != NULL) {
|
|
||||||
- newlog->shred_cycles = strtoul(key, &chptr, 0);
|
|
||||||
- if (*chptr || newlog->shred_cycles < 0) {
|
|
||||||
- message(MESS_ERROR, "%s:%d bad shred cycles '%s'\n",
|
|
||||||
- configFile, lineNum, key);
|
|
||||||
- goto error;
|
|
||||||
- }
|
|
||||||
+ key = isolateValue(configFile, lineNum, "shred cycles",
|
|
||||||
+ &start, &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ newlog->shred_cycles = strtoul(key, &chptr, 0);
|
|
||||||
+ if (*chptr || newlog->shred_cycles < 0) {
|
|
||||||
+ message(MESS_ERROR, "%s:%d bad shred cycles '%s'\n",
|
|
||||||
+ configFile, lineNum, key);
|
|
||||||
+ goto error;
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "hourly")) {
|
|
||||||
newlog->criterium = ROT_HOURLY;
|
|
||||||
} else if (!strcmp(key, "daily")) {
|
|
||||||
@@ -1232,59 +1233,53 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
newlog->criterium = ROT_YEARLY;
|
|
||||||
} else if (!strcmp(key, "rotate")) {
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue
|
|
||||||
- (configFile, lineNum, "rotate count", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
-
|
|
||||||
- newlog->rotateCount = strtoul(key, &chptr, 0);
|
|
||||||
- if (*chptr || newlog->rotateCount < 0) {
|
|
||||||
- message(MESS_ERROR,
|
|
||||||
- "%s:%d bad rotation count '%s'\n",
|
|
||||||
- configFile, lineNum, key);
|
|
||||||
- RAISE_ERROR();
|
|
||||||
- }
|
|
||||||
+ key = isolateValue(configFile, lineNum, "rotate count", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ newlog->rotateCount = strtoul(key, &chptr, 0);
|
|
||||||
+ if (*chptr || newlog->rotateCount < 0) {
|
|
||||||
+ message(MESS_ERROR,
|
|
||||||
+ "%s:%d bad rotation count '%s'\n",
|
|
||||||
+ configFile, lineNum, key);
|
|
||||||
+ RAISE_ERROR();
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "start")) {
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue
|
|
||||||
- (configFile, lineNum, "start count", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
-
|
|
||||||
- newlog->logStart = strtoul(key, &chptr, 0);
|
|
||||||
- if (*chptr || newlog->logStart < 0) {
|
|
||||||
- message(MESS_ERROR, "%s:%d bad start count '%s'\n",
|
|
||||||
- configFile, lineNum, key);
|
|
||||||
- RAISE_ERROR();
|
|
||||||
- }
|
|
||||||
+ key = isolateValue(configFile, lineNum, "start count", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ newlog->logStart = strtoul(key, &chptr, 0);
|
|
||||||
+ if (*chptr || newlog->logStart < 0) {
|
|
||||||
+ message(MESS_ERROR, "%s:%d bad start count '%s'\n",
|
|
||||||
+ configFile, lineNum, key);
|
|
||||||
+ RAISE_ERROR();
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "minage")) {
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue
|
|
||||||
- (configFile, lineNum, "minage count", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
- newlog->rotateMinAge = strtoul(key, &chptr, 0);
|
|
||||||
- if (*chptr || newlog->rotateMinAge < 0) {
|
|
||||||
- message(MESS_ERROR, "%s:%d bad minimum age '%s'\n",
|
|
||||||
- configFile, lineNum, start);
|
|
||||||
- RAISE_ERROR();
|
|
||||||
- }
|
|
||||||
+ key = isolateValue(configFile, lineNum, "minage count", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ newlog->rotateMinAge = strtoul(key, &chptr, 0);
|
|
||||||
+ if (*chptr || newlog->rotateMinAge < 0) {
|
|
||||||
+ message(MESS_ERROR, "%s:%d bad minimum age '%s'\n",
|
|
||||||
+ configFile, lineNum, start);
|
|
||||||
+ RAISE_ERROR();
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "maxage")) {
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue
|
|
||||||
- (configFile, lineNum, "maxage count", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
- newlog->rotateAge = strtoul(key, &chptr, 0);
|
|
||||||
- if (*chptr || newlog->rotateAge < 0) {
|
|
||||||
- message(MESS_ERROR, "%s:%d bad maximum age '%s'\n",
|
|
||||||
- configFile, lineNum, start);
|
|
||||||
- RAISE_ERROR();
|
|
||||||
- }
|
|
||||||
+ key = isolateValue(configFile, lineNum, "maxage count", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ newlog->rotateAge = strtoul(key, &chptr, 0);
|
|
||||||
+ if (*chptr || newlog->rotateAge < 0) {
|
|
||||||
+ message(MESS_ERROR, "%s:%d bad maximum age '%s'\n",
|
|
||||||
+ configFile, lineNum, start);
|
|
||||||
+ RAISE_ERROR();
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "errors")) {
|
|
||||||
message(MESS_DEBUG,
|
|
||||||
"%s: %d: the errors directive is deprecated and no longer used.\n",
|
|
||||||
@@ -1337,48 +1332,48 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue(configFile, lineNum, "tabooext", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
- endtag = key;
|
|
||||||
- if (*endtag == '+') {
|
|
||||||
+ key = isolateValue(configFile, lineNum, "tabooext", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ endtag = key;
|
|
||||||
+ if (*endtag == '+') {
|
|
||||||
+ endtag++;
|
|
||||||
+ while (isspace((unsigned char)*endtag) && *endtag)
|
|
||||||
endtag++;
|
|
||||||
- while (isspace((unsigned char)*endtag) && *endtag)
|
|
||||||
- endtag++;
|
|
||||||
- } else {
|
|
||||||
- free_2d_array(tabooPatterns, tabooCount);
|
|
||||||
- tabooCount = 0;
|
|
||||||
- /* realloc of NULL is safe by definition */
|
|
||||||
- tabooPatterns = NULL;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- while (*endtag) {
|
|
||||||
- int bytes;
|
|
||||||
- char *pattern = NULL;
|
|
||||||
+ } else {
|
|
||||||
+ free_2d_array(tabooPatterns, tabooCount);
|
|
||||||
+ tabooCount = 0;
|
|
||||||
+ /* realloc of NULL is safe by definition */
|
|
||||||
+ tabooPatterns = NULL;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- chptr = endtag;
|
|
||||||
- while (!isspace((unsigned char)*chptr) && *chptr != ',' && *chptr)
|
|
||||||
- chptr++;
|
|
||||||
+ while (*endtag) {
|
|
||||||
+ int bytes;
|
|
||||||
+ char *pattern = NULL;
|
|
||||||
|
|
||||||
- /* accept only non-empty patterns to avoid exclusion of everything */
|
|
||||||
- if (endtag < chptr) {
|
|
||||||
- tabooPatterns = realloc(tabooPatterns, sizeof(*tabooPatterns) *
|
|
||||||
- (tabooCount + 1));
|
|
||||||
- bytes = asprintf(&pattern, "*%.*s", (int)(chptr - endtag), endtag);
|
|
||||||
+ chptr = endtag;
|
|
||||||
+ while (!isspace((unsigned char)*chptr) && *chptr != ',' && *chptr)
|
|
||||||
+ chptr++;
|
|
||||||
|
|
||||||
- /* should test for malloc() failure */
|
|
||||||
- assert(bytes != -1);
|
|
||||||
- tabooPatterns[tabooCount] = pattern;
|
|
||||||
- tabooCount++;
|
|
||||||
- }
|
|
||||||
+ /* accept only non-empty patterns to avoid exclusion of everything */
|
|
||||||
+ if (endtag < chptr) {
|
|
||||||
+ tabooPatterns = realloc(tabooPatterns, sizeof(*tabooPatterns) *
|
|
||||||
+ (tabooCount + 1));
|
|
||||||
+ bytes = asprintf(&pattern, "*%.*s", (int)(chptr - endtag), endtag);
|
|
||||||
|
|
||||||
- endtag = chptr;
|
|
||||||
- if (*endtag == ',')
|
|
||||||
- endtag++;
|
|
||||||
- while (*endtag && isspace((unsigned char)*endtag))
|
|
||||||
- endtag++;
|
|
||||||
+ /* should test for malloc() failure */
|
|
||||||
+ assert(bytes != -1);
|
|
||||||
+ tabooPatterns[tabooCount] = pattern;
|
|
||||||
+ tabooCount++;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ endtag = chptr;
|
|
||||||
+ if (*endtag == ',')
|
|
||||||
+ endtag++;
|
|
||||||
+ while (*endtag && isspace((unsigned char)*endtag))
|
|
||||||
+ endtag++;
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "taboopat")) {
|
|
||||||
if (newlog != defConfig) {
|
|
||||||
message(MESS_ERROR,
|
|
||||||
@@ -1389,68 +1384,68 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue(configFile, lineNum, "taboopat", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
- endtag = key;
|
|
||||||
- if (*endtag == '+') {
|
|
||||||
+ key = isolateValue(configFile, lineNum, "taboopat", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ endtag = key;
|
|
||||||
+ if (*endtag == '+') {
|
|
||||||
+ endtag++;
|
|
||||||
+ while (isspace((unsigned char)*endtag) && *endtag)
|
|
||||||
endtag++;
|
|
||||||
- while (isspace((unsigned char)*endtag) && *endtag)
|
|
||||||
- endtag++;
|
|
||||||
- } else {
|
|
||||||
- free_2d_array(tabooPatterns, tabooCount);
|
|
||||||
- tabooCount = 0;
|
|
||||||
- /* realloc of NULL is safe by definition */
|
|
||||||
- tabooPatterns = NULL;
|
|
||||||
- }
|
|
||||||
+ } else {
|
|
||||||
+ free_2d_array(tabooPatterns, tabooCount);
|
|
||||||
+ tabooCount = 0;
|
|
||||||
+ /* realloc of NULL is safe by definition */
|
|
||||||
+ tabooPatterns = NULL;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- while (*endtag) {
|
|
||||||
- int bytes;
|
|
||||||
- char *pattern = NULL;
|
|
||||||
+ while (*endtag) {
|
|
||||||
+ int bytes;
|
|
||||||
+ char *pattern = NULL;
|
|
||||||
|
|
||||||
- chptr = endtag;
|
|
||||||
- while (!isspace((unsigned char)*chptr) && *chptr != ',' && *chptr)
|
|
||||||
- chptr++;
|
|
||||||
+ chptr = endtag;
|
|
||||||
+ while (!isspace((unsigned char)*chptr) && *chptr != ',' && *chptr)
|
|
||||||
+ chptr++;
|
|
||||||
|
|
||||||
- tabooPatterns = realloc(tabooPatterns, sizeof(*tabooPatterns) *
|
|
||||||
- (tabooCount + 1));
|
|
||||||
- bytes = asprintf(&pattern, "%.*s", (int)(chptr - endtag), endtag);
|
|
||||||
+ tabooPatterns = realloc(tabooPatterns, sizeof(*tabooPatterns) *
|
|
||||||
+ (tabooCount + 1));
|
|
||||||
+ bytes = asprintf(&pattern, "%.*s", (int)(chptr - endtag), endtag);
|
|
||||||
|
|
||||||
- /* should test for malloc() failure */
|
|
||||||
- assert(bytes != -1);
|
|
||||||
- tabooPatterns[tabooCount] = pattern;
|
|
||||||
- tabooCount++;
|
|
||||||
+ /* should test for malloc() failure */
|
|
||||||
+ assert(bytes != -1);
|
|
||||||
+ tabooPatterns[tabooCount] = pattern;
|
|
||||||
+ tabooCount++;
|
|
||||||
|
|
||||||
- endtag = chptr;
|
|
||||||
- if (*endtag == ',')
|
|
||||||
- endtag++;
|
|
||||||
- while (*endtag && isspace((unsigned char)*endtag))
|
|
||||||
- endtag++;
|
|
||||||
- }
|
|
||||||
+ endtag = chptr;
|
|
||||||
+ if (*endtag == ',')
|
|
||||||
+ endtag++;
|
|
||||||
+ while (*endtag && isspace((unsigned char)*endtag))
|
|
||||||
+ endtag++;
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "include")) {
|
|
||||||
free(key);
|
|
||||||
- if ((key = isolateValue(configFile, lineNum, "include", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
-
|
|
||||||
- message(MESS_DEBUG, "including %s\n", key);
|
|
||||||
- if (recursion_depth >= MAX_NESTING) {
|
|
||||||
- message(MESS_ERROR, "%s:%d include nesting too deep\n",
|
|
||||||
- configFile, lineNum);
|
|
||||||
- logerror = 1;
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
+ key = isolateValue(configFile, lineNum, "include", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ message(MESS_DEBUG, "including %s\n", key);
|
|
||||||
+ if (recursion_depth >= MAX_NESTING) {
|
|
||||||
+ message(MESS_ERROR, "%s:%d include nesting too deep\n",
|
|
||||||
+ configFile, lineNum);
|
|
||||||
+ logerror = 1;
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- ++recursion_depth;
|
|
||||||
- rv = readConfigPath(key, newlog);
|
|
||||||
- --recursion_depth;
|
|
||||||
+ ++recursion_depth;
|
|
||||||
+ rv = readConfigPath(key, newlog);
|
|
||||||
+ --recursion_depth;
|
|
||||||
|
|
||||||
- if (rv) {
|
|
||||||
- logerror = 1;
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
+ if (rv) {
|
|
||||||
+ logerror = 1;
|
|
||||||
+ continue;
|
|
||||||
}
|
|
||||||
- else continue;
|
|
||||||
} else if (!strcmp(key, "olddir")) {
|
|
||||||
freeLogItem (oldDir);
|
|
||||||
|
|
||||||
@@ -1460,28 +1455,23 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
}
|
|
||||||
message(MESS_DEBUG, "olddir is now %s\n", newlog->oldDir);
|
|
||||||
} else if (!strcmp(key, "extension")) {
|
|
||||||
- if ((key = isolateValue
|
|
||||||
- (configFile, lineNum, "extension name", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
- freeLogItem (extension);
|
|
||||||
- newlog->extension = key;
|
|
||||||
- key = NULL;
|
|
||||||
- }
|
|
||||||
- else continue;
|
|
||||||
-
|
|
||||||
- message(MESS_DEBUG, "extension is now %s\n",
|
|
||||||
- newlog->extension);
|
|
||||||
+ key = isolateValue(configFile, lineNum, "extension name", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ freeLogItem (extension);
|
|
||||||
+ newlog->extension = key;
|
|
||||||
+ key = NULL;
|
|
||||||
+ message(MESS_DEBUG, "extension is now %s\n", newlog->extension);
|
|
||||||
|
|
||||||
} else if (!strcmp(key, "addextension")) {
|
|
||||||
- if ((key = isolateValue
|
|
||||||
- (configFile, lineNum, "addextension name", &start,
|
|
||||||
- &buf, length)) != NULL) {
|
|
||||||
- freeLogItem (addextension);
|
|
||||||
- newlog->addextension = key;
|
|
||||||
- key = NULL;
|
|
||||||
- }
|
|
||||||
- else continue;
|
|
||||||
-
|
|
||||||
+ key = isolateValue(configFile, lineNum, "addextension name", &start,
|
|
||||||
+ &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
+ continue;
|
|
||||||
+ freeLogItem (addextension);
|
|
||||||
+ newlog->addextension = key;
|
|
||||||
+ key = NULL;
|
|
||||||
message(MESS_DEBUG, "addextension is now %s\n",
|
|
||||||
newlog->addextension);
|
|
||||||
|
|
||||||
@@ -1827,7 +1817,8 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
break;
|
|
||||||
case STATE_LOAD_SCRIPT:
|
|
||||||
case STATE_LOAD_SCRIPT | STATE_SKIP_CONFIG:
|
|
||||||
- if ((key = isolateWord(&start, &buf, length)) == NULL)
|
|
||||||
+ key = isolateWord(&start, &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (strcmp(key, "endscript") == 0) {
|
|
||||||
@@ -1862,7 +1853,8 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
newlog = defConfig;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
- if ((key = isolateWord(&start, &buf, length)) == NULL)
|
|
||||||
+ key = isolateWord(&start, &buf, length);
|
|
||||||
+ if (key == NULL)
|
|
||||||
continue;
|
|
||||||
if (
|
|
||||||
(strcmp(key, "postrotate") == 0) ||
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
|
|
||||||
From a3a955494999bd4861f14b846c345cbc96715262 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Wed, 1 Aug 2018 15:09:40 +0200
|
|
||||||
Subject: [PATCH 2/3] readConfigFile: assign and free 'key' consistently
|
|
||||||
|
|
||||||
This commit fixes the following memory leaks (detected by Coverity):
|
|
||||||
|
|
||||||
Error: RESOURCE_LEAK:
|
|
||||||
config.c:1466: overwrite_var: Overwriting "key" in "key = isolateValue(configFile, lineNum, "extension name", &start, &buf, length)" leaks the storage that "key" points to.
|
|
||||||
|
|
||||||
Error: RESOURCE_LEAK:
|
|
||||||
config.c:1479: overwrite_var: Overwriting "key" in "key = isolateValue(configFile, lineNum, "addextension name", &start, &buf, length)" leaks the storage that "key" points to.
|
|
||||||
|
|
||||||
Error: RESOURCE_LEAK:
|
|
||||||
config.c:1043: alloc_fn: Storage is returned from allocation function "isolateWord".
|
|
||||||
config.c:219:2: alloc_fn: Storage is returned from allocation function "strndup".
|
|
||||||
config.c:219:2: assign: Assigning: "key" = "strndup(start, endtag - start)".
|
|
||||||
config.c:221:2: return_alloc: Returning allocated memory "key".
|
|
||||||
config.c:1043: var_assign: Assigning: "key" = storage returned from "isolateWord(&start, &buf, length)".
|
|
||||||
config.c:1928: leaked_storage: Variable "key" going out of scope leaks the storage it points to.
|
|
||||||
|
|
||||||
Error: RESOURCE_LEAK:
|
|
||||||
config.c:1153: alloc_fn: Storage is returned from allocation function "isolateValue".
|
|
||||||
config.c:204:2: alloc_fn: Storage is returned from allocation function "isolateLine".
|
|
||||||
config.c:178:2: alloc_fn: Storage is returned from allocation function "strndup".
|
|
||||||
config.c:178:2: assign: Assigning: "key" = "strndup(start, endtag - start + 1L)".
|
|
||||||
config.c:180:2: return_alloc: Returning allocated memory "key".
|
|
||||||
config.c:204:2: return_alloc_fn: Directly returning storage allocated by "isolateLine".
|
|
||||||
config.c:1153: var_assign: Assigning: "key" = storage returned from "isolateValue(configFile, lineNum, opt, &start, &buf, length)".
|
|
||||||
config.c:1928: leaked_storage: Variable "key" going out of scope leaks the storage it points to.
|
|
||||||
|
|
||||||
Error: RESOURCE_LEAK:
|
|
||||||
config.c:1219: alloc_fn: Storage is returned from allocation function "isolateLine".
|
|
||||||
config.c:178:2: alloc_fn: Storage is returned from allocation function "strndup".
|
|
||||||
config.c:178:2: assign: Assigning: "key" = "strndup(start, endtag - start + 1L)".
|
|
||||||
config.c:180:2: return_alloc: Returning allocated memory "key".
|
|
||||||
config.c:1219: var_assign: Assigning: "key" = storage returned from "isolateLine(&start, &buf, length)".
|
|
||||||
config.c:1928: leaked_storage: Variable "key" going out of scope leaks the storage it points to.
|
|
||||||
|
|
||||||
Closes #208
|
|
||||||
---
|
|
||||||
config.c | 19 +++++++------------
|
|
||||||
1 file changed, 7 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.c b/config.c
|
|
||||||
index d2fba10..39c9bc7 100644
|
|
||||||
--- a/config.c
|
|
||||||
+++ b/config.c
|
|
||||||
@@ -1022,10 +1022,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
|
|
||||||
start = buf;
|
|
||||||
for (start = buf; start - buf < length; start++) {
|
|
||||||
- if (key) {
|
|
||||||
- free(key);
|
|
||||||
- key = NULL;
|
|
||||||
- }
|
|
||||||
switch (state) {
|
|
||||||
case STATE_DEFAULT:
|
|
||||||
if (isblank((unsigned char)*start))
|
|
||||||
@@ -1037,6 +1033,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isalpha((unsigned char)*start)) {
|
|
||||||
+ free(key);
|
|
||||||
key = isolateWord(&start, &buf, length);
|
|
||||||
if (key == NULL)
|
|
||||||
continue;
|
|
||||||
@@ -1455,6 +1452,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
}
|
|
||||||
message(MESS_DEBUG, "olddir is now %s\n", newlog->oldDir);
|
|
||||||
} else if (!strcmp(key, "extension")) {
|
|
||||||
+ free(key);
|
|
||||||
key = isolateValue(configFile, lineNum, "extension name", &start,
|
|
||||||
&buf, length);
|
|
||||||
if (key == NULL)
|
|
||||||
@@ -1465,6 +1463,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
message(MESS_DEBUG, "extension is now %s\n", newlog->extension);
|
|
||||||
|
|
||||||
} else if (!strcmp(key, "addextension")) {
|
|
||||||
+ free(key);
|
|
||||||
key = isolateValue(configFile, lineNum, "addextension name", &start,
|
|
||||||
&buf, length);
|
|
||||||
if (key == NULL)
|
|
||||||
@@ -1557,8 +1556,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
if (*start != '\n')
|
|
||||||
state = STATE_SKIP_LINE;
|
|
||||||
}
|
|
||||||
- free(key);
|
|
||||||
- key = NULL;
|
|
||||||
} else if (*start == '/' || *start == '"' || *start == '\''
|
|
||||||
#ifdef GLOB_TILDE
|
|
||||||
|| *start == '~'
|
|
||||||
@@ -1817,6 +1814,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
break;
|
|
||||||
case STATE_LOAD_SCRIPT:
|
|
||||||
case STATE_LOAD_SCRIPT | STATE_SKIP_CONFIG:
|
|
||||||
+ free(key);
|
|
||||||
key = isolateWord(&start, &buf, length);
|
|
||||||
if (key == NULL)
|
|
||||||
continue;
|
|
||||||
@@ -1853,6 +1851,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
newlog = defConfig;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
+ free(key);
|
|
||||||
key = isolateWord(&start, &buf, length);
|
|
||||||
if (key == NULL)
|
|
||||||
continue;
|
|
||||||
@@ -1884,8 +1883,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
state = STATE_SKIP_LINE | STATE_SKIP_CONFIG;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- free(key);
|
|
||||||
- key = NULL;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
@@ -1893,10 +1890,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
"%s: %d: readConfigFile() unknown state\n",
|
|
||||||
configFile, lineNum);
|
|
||||||
}
|
|
||||||
- if (key) {
|
|
||||||
- free(key);
|
|
||||||
- key = NULL;
|
|
||||||
- }
|
|
||||||
if (*start == '\n') {
|
|
||||||
lineNum++;
|
|
||||||
}
|
|
||||||
@@ -1910,6 +1903,8 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ free(key);
|
|
||||||
+
|
|
||||||
munmap(buf, (size_t) length);
|
|
||||||
close(fd);
|
|
||||||
return logerror;
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
|
|
||||||
From 771af94fd6c6299a7cb3d20c8b247591775653d3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Wed, 1 Aug 2018 16:06:27 +0200
|
|
||||||
Subject: [PATCH 3/3] simplify code of prerotateSingleLog()
|
|
||||||
|
|
||||||
... to eliminate a use-after-free false positive reported by Coverity:
|
|
||||||
|
|
||||||
Error: USE_AFTER_FREE:
|
|
||||||
logrotate.c:1800: freed_arg: "free" frees "oldName".
|
|
||||||
logrotate.c:1779: use_after_free: Using freed pointer "oldName".
|
|
||||||
|
|
||||||
Closes #209
|
|
||||||
---
|
|
||||||
logrotate.c | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/logrotate.c b/logrotate.c
|
|
||||||
index 02d45e9..95fd70b 100644
|
|
||||||
--- a/logrotate.c
|
|
||||||
+++ b/logrotate.c
|
|
||||||
@@ -1353,7 +1353,7 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
|
|
||||||
struct logState *state, struct logNames *rotNames)
|
|
||||||
{
|
|
||||||
struct tm now = *localtime(&nowSecs);
|
|
||||||
- char *oldName, *newName = NULL;
|
|
||||||
+ char *oldName = NULL;
|
|
||||||
const char *compext = "";
|
|
||||||
const char *fileext = "";
|
|
||||||
int hasErrors = 0;
|
|
||||||
@@ -1670,6 +1670,7 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
|
|
||||||
free(glob_pattern);
|
|
||||||
} else {
|
|
||||||
int i;
|
|
||||||
+ char *newName = NULL;
|
|
||||||
if (log->rotateAge) {
|
|
||||||
struct stat fst_buf;
|
|
||||||
for (i = 1; i <= rotateCount + 1; i++) {
|
|
||||||
@@ -1697,7 +1698,6 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
|
|
||||||
compext) < 0) {
|
|
||||||
message(MESS_FATAL, "could not allocate disposeName memory\n");
|
|
||||||
}
|
|
||||||
- newName = strdup(oldName);
|
|
||||||
|
|
||||||
rotNames->disposeName = strdup(oldName);
|
|
||||||
|
|
||||||
@@ -1711,6 +1711,8 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
|
|
||||||
if (asprintf(&oldName, "%s/%s.%d%s%s", rotNames->dirName,
|
|
||||||
rotNames->baseName, i, fileext, compext) < 0) {
|
|
||||||
message(MESS_FATAL, "could not allocate oldName memory\n");
|
|
||||||
+ oldName = NULL;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
|
|
||||||
message(MESS_DEBUG,
|
|
||||||
@@ -1727,11 +1729,9 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
|
|
||||||
hasErrors = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if (hasErrors || i - 1 < 0)
|
|
||||||
- free(oldName);
|
|
||||||
-
|
|
||||||
}
|
|
||||||
free(newName);
|
|
||||||
+ free(oldName);
|
|
||||||
} /* !LOG_FLAG_DATEEXT */
|
|
||||||
|
|
||||||
if (log->flags & LOG_FLAG_DATEEXT) {
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
From 4810afca1223099c1546da8d73d653c0d1eff96e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Tue, 27 Apr 2021 18:36:30 +0200
|
||||||
|
Subject: [PATCH 1/2] logrotate.8: unify documentation of
|
||||||
|
copy/copytruncate/renamecopy
|
||||||
|
|
||||||
|
Bug: https://bugzilla.redhat.com/1934629
|
||||||
|
|
||||||
|
Closes: https://github.com/logrotate/logrotate/pull/386
|
||||||
|
|
||||||
|
Upstream-commit: 6ac9fe5759678b4c2b312eea490ebbae25092213
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.8.in | 18 +++++++++++++-----
|
||||||
|
1 file changed, 13 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/logrotate.8.in b/logrotate.8.in
|
||||||
|
index f27c279..8064d68 100644
|
||||||
|
--- a/logrotate.8.in
|
||||||
|
+++ b/logrotate.8.in
|
||||||
|
@@ -411,7 +411,8 @@ Make a copy of the log file, but don't change the original at all.
|
||||||
|
This option can be used, for instance, to make a snapshot of the current
|
||||||
|
log file, or when some other utility needs to truncate or parse the file.
|
||||||
|
When this option is used, the \fBcreate\fR option will have no effect,
|
||||||
|
-as the old log file stays in place.
|
||||||
|
+as the old log file stays in place. The \fBcopy\fR option allows storing
|
||||||
|
+rotated log files on the different devices using \fBolddir\fR directive.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fBnocopy\fR
|
||||||
|
@@ -427,7 +428,9 @@ and thus might continue writing (appending) to the previous log file forever.
|
||||||
|
Note that there is a very small time slice between copying the file and
|
||||||
|
truncating it, so some logging data might be lost.
|
||||||
|
When this option is used, the \fBcreate\fR option will have no effect,
|
||||||
|
-as the old log file stays in place.
|
||||||
|
+as the old log file stays in place. The \fBcopytruncate\fR option allows
|
||||||
|
+storing rotated log files on the different devices using \fBolddir\fR
|
||||||
|
+directive.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fBnocopytruncate\fR
|
||||||
|
@@ -438,9 +441,14 @@ Do not truncate the original log file in place after creating a copy
|
||||||
|
\fBrenamecopy\fR
|
||||||
|
Log file is renamed to temporary filename in the same directory by adding
|
||||||
|
".tmp" extension to it. After that, \fBpostrotate\fR script is run
|
||||||
|
-and log file is copied from temporary filename to final filename. This allows
|
||||||
|
-storing rotated log files on the different devices using \fBolddir\fR
|
||||||
|
-directive. In the end, temporary filename is removed.
|
||||||
|
+and log file is copied from temporary filename to final filename. In the end,
|
||||||
|
+temporary filename is removed. The \fBrenamecopy\fR option allows storing
|
||||||
|
+rotated log files on the different devices using \fBolddir\fR directive.
|
||||||
|
+
|
||||||
|
+.TP
|
||||||
|
+\fBnorenamecopy\fR
|
||||||
|
+Do not rename and copy the original log file
|
||||||
|
+(this overrides the \fBrenamecopy\fR option).
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fBshred\fR
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
From b98dd1933b1ebf5c86041bf135af421fe1ce4fc9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Fri, 28 Jun 2019 18:22:39 +0200
|
|
||||||
Subject: [PATCH] globerr: do not abort globbing on broken symlink
|
|
||||||
|
|
||||||
Fixes #251
|
|
||||||
|
|
||||||
Upstream-commit: 4297f01103915f4ee356d37bdb35e8c41bbbdb28
|
|
||||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
---
|
|
||||||
config.c | 16 +++++++++++++---
|
|
||||||
test/Makefile.am | 1 +
|
|
||||||
test/test-0084.sh | 14 ++++++++++++++
|
|
||||||
test/test-config.84.in | 3 +++
|
|
||||||
4 files changed, 31 insertions(+), 3 deletions(-)
|
|
||||||
create mode 100755 test/test-0084.sh
|
|
||||||
create mode 100644 test/test-config.84.in
|
|
||||||
|
|
||||||
diff --git a/config.c b/config.c
|
|
||||||
index e4807c9..1805a16 100644
|
|
||||||
--- a/config.c
|
|
||||||
+++ b/config.c
|
|
||||||
@@ -834,9 +834,19 @@ static int globerr(const char *pathname, int theerr)
|
|
||||||
{
|
|
||||||
(void) pathname;
|
|
||||||
|
|
||||||
- /* A missing directory is not an error, so return 0 */
|
|
||||||
- if (theerr == ENOTDIR)
|
|
||||||
- return 0;
|
|
||||||
+ /* prevent glob() from being aborted in certain cases */
|
|
||||||
+ switch (theerr) {
|
|
||||||
+ case ENOTDIR:
|
|
||||||
+ /* non-directory where directory was expected by the glob */
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ case ENOENT:
|
|
||||||
+ /* most likely symlink with non-existent target */
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ default:
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
glob_errno = theerr;
|
|
||||||
|
|
||||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
|
||||||
index 5e838d1..35ba2b9 100644
|
|
||||||
--- a/test/Makefile.am
|
|
||||||
+++ b/test/Makefile.am
|
|
||||||
@@ -76,6 +76,7 @@ TEST_CASES = \
|
|
||||||
test-0075.sh \
|
|
||||||
test-0076.sh \
|
|
||||||
test-0077.sh \
|
|
||||||
+ test-0084.sh \
|
|
||||||
test-0100.sh \
|
|
||||||
test-0101.sh
|
|
||||||
|
|
||||||
diff --git a/test/test-0084.sh b/test/test-0084.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..1389331
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/test/test-0084.sh
|
|
||||||
@@ -0,0 +1,14 @@
|
|
||||||
+#!/bin/bash
|
|
||||||
+
|
|
||||||
+. ./test-common.sh
|
|
||||||
+
|
|
||||||
+cleanup 84
|
|
||||||
+
|
|
||||||
+# ------------------------------- Test 84 ------------------------------------
|
|
||||||
+preptest test.log 84 1
|
|
||||||
+
|
|
||||||
+mkdir -p log/dir
|
|
||||||
+ln -s XXX log/sym
|
|
||||||
+touch log/dir/file
|
|
||||||
+
|
|
||||||
+$RLR test-config.84 -v --force
|
|
||||||
diff --git a/test/test-config.84.in b/test/test-config.84.in
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..1a79bfe
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/test/test-config.84.in
|
|
||||||
@@ -0,0 +1,3 @@
|
|
||||||
+&DIR&/log/*/* {
|
|
||||||
+ rotate 1
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.21.3
|
|
||||||
|
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
From 337eb1492f8b694542d704c7a4612e3211f717e5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Tue, 27 Apr 2021 20:52:32 +0200
|
||||||
|
Subject: [PATCH 2/2] make `renamecopy` and `copytruncate` override each other
|
||||||
|
|
||||||
|
These option cannot work together. This rule prevents unnecessary
|
||||||
|
rotation failure in case one of the options comes from the global
|
||||||
|
configuration and the other one from log-specific configuration.
|
||||||
|
|
||||||
|
Bug: https://bugzilla.redhat.com/1934601
|
||||||
|
|
||||||
|
Closes: https://github.com/logrotate/logrotate/pull/386
|
||||||
|
|
||||||
|
Upstream-commit: fe53a0efd21c11dbe9705564f92f5d9aa6bf855e
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
config.c | 2 ++
|
||||||
|
logrotate.8.in | 3 ++-
|
||||||
|
test/test-config.24.in | 3 +++
|
||||||
|
test/test-config.58.in | 3 +++
|
||||||
|
4 files changed, 10 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/config.c b/config.c
|
||||||
|
index 91fd412..1bca9e4 100644
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -1106,10 +1106,12 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||||
|
newlog->flags &= ~LOG_FLAG_SHAREDSCRIPTS;
|
||||||
|
} else if (!strcmp(key, "copytruncate")) {
|
||||||
|
newlog->flags |= LOG_FLAG_COPYTRUNCATE;
|
||||||
|
+ newlog->flags &= ~LOG_FLAG_TMPFILENAME;
|
||||||
|
} else if (!strcmp(key, "nocopytruncate")) {
|
||||||
|
newlog->flags &= ~LOG_FLAG_COPYTRUNCATE;
|
||||||
|
} else if (!strcmp(key, "renamecopy")) {
|
||||||
|
newlog->flags |= LOG_FLAG_TMPFILENAME;
|
||||||
|
+ newlog->flags &= ~LOG_FLAG_COPYTRUNCATE;
|
||||||
|
} else if (!strcmp(key, "norenamecopy")) {
|
||||||
|
newlog->flags &= ~LOG_FLAG_TMPFILENAME;
|
||||||
|
} else if (!strcmp(key, "copy")) {
|
||||||
|
diff --git a/logrotate.8.in b/logrotate.8.in
|
||||||
|
index 8064d68..f0aa23f 100644
|
||||||
|
--- a/logrotate.8.in
|
||||||
|
+++ b/logrotate.8.in
|
||||||
|
@@ -430,7 +430,7 @@ truncating it, so some logging data might be lost.
|
||||||
|
When this option is used, the \fBcreate\fR option will have no effect,
|
||||||
|
as the old log file stays in place. The \fBcopytruncate\fR option allows
|
||||||
|
storing rotated log files on the different devices using \fBolddir\fR
|
||||||
|
-directive.
|
||||||
|
+directive. The \fBcopytruncate\fR option implies \fBnorenamecopy\fR.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fBnocopytruncate\fR
|
||||||
|
@@ -444,6 +444,7 @@ Log file is renamed to temporary filename in the same directory by adding
|
||||||
|
and log file is copied from temporary filename to final filename. In the end,
|
||||||
|
temporary filename is removed. The \fBrenamecopy\fR option allows storing
|
||||||
|
rotated log files on the different devices using \fBolddir\fR directive.
|
||||||
|
+The \fBrenamecopy\fR option implies \fBnocopytruncate\fR.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fBnorenamecopy\fR
|
||||||
|
diff --git a/test/test-config.24.in b/test/test-config.24.in
|
||||||
|
index 35cfcd3..7a2a760 100644
|
||||||
|
--- a/test/test-config.24.in
|
||||||
|
+++ b/test/test-config.24.in
|
||||||
|
@@ -1,5 +1,8 @@
|
||||||
|
create
|
||||||
|
|
||||||
|
+# will be overridden by copytruncate
|
||||||
|
+renamecopy
|
||||||
|
+
|
||||||
|
&DIR&/test*.log {
|
||||||
|
daily
|
||||||
|
copytruncate
|
||||||
|
diff --git a/test/test-config.58.in b/test/test-config.58.in
|
||||||
|
index 34906da..79058be 100644
|
||||||
|
--- a/test/test-config.58.in
|
||||||
|
+++ b/test/test-config.58.in
|
||||||
|
@@ -1,5 +1,8 @@
|
||||||
|
create
|
||||||
|
|
||||||
|
+# will be overridden by renamecopy
|
||||||
|
+copytruncate
|
||||||
|
+
|
||||||
|
&DIR&/test.log {
|
||||||
|
renamecopy
|
||||||
|
weekly
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
From 893ab396daffebfe5bb97e9fcf0adbd7fda1b828 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Fri, 18 Jan 2019 16:10:56 +0100
|
|
||||||
Subject: [PATCH] logrotate.8: encourage admins to use the `su` directive
|
|
||||||
|
|
||||||
... to rotate files in directories that are directly or indirectly in
|
|
||||||
control of non-privileged users. Originally reported in the following
|
|
||||||
pull request:
|
|
||||||
|
|
||||||
https://github.com/logrotate/logrotate/pull/235
|
|
||||||
|
|
||||||
Closes #236
|
|
||||||
|
|
||||||
Upstream-commit: 3e170c0609a18e0bb5fd7f647cb877221d576456
|
|
||||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
---
|
|
||||||
logrotate.8.in | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/logrotate.8.in b/logrotate.8.in
|
|
||||||
index 56c4a32..ee26821 100644
|
|
||||||
--- a/logrotate.8.in
|
|
||||||
+++ b/logrotate.8.in
|
|
||||||
@@ -575,7 +575,9 @@ user/group (usually root). \fIuser\fR specifies the user name used for
|
|
||||||
rotation and \fIgroup\fR specifies the group used for rotation. If the
|
|
||||||
user/group you specify here does not have sufficient privilege to make
|
|
||||||
files with the ownership you've specified in a \fIcreate\fR instruction,
|
|
||||||
-it will cause an error.
|
|
||||||
+it will cause an error. If logrotate runs with root privileges, it is
|
|
||||||
+recommended to use the \fBsu\fR directive to rotate files in directories
|
|
||||||
+that are directly or indirectly in control of non-privileged users.
|
|
||||||
|
|
||||||
.TP
|
|
||||||
\fBtabooext\fR [+] \fIlist\fR
|
|
||||||
--
|
|
||||||
2.21.3
|
|
||||||
|
|
||||||
@ -0,0 +1,253 @@
|
|||||||
|
From 53e0dc4a8ddcb169b0ba36472de03f4366f45159 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||||||
|
Date: Tue, 29 Mar 2022 21:06:54 +0200
|
||||||
|
Subject: [PATCH 1/3] skip locking if state file is world-readable
|
||||||
|
|
||||||
|
Fixes: CVE-2022-1348 - potential DoS from unprivileged users via the state file
|
||||||
|
Bug: https://bugzilla.redhat.com/CVE-2022-1348
|
||||||
|
|
||||||
|
Upstream-commit: 1f76a381e2caa0603ae3dbc51ed0f1aa0d6658b9
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 24 ++++++++++++++++++++++--
|
||||||
|
logrotate.spec.in | 3 +--
|
||||||
|
test/Makefile.am | 1 +
|
||||||
|
test/test-0087.sh | 1 +
|
||||||
|
test/test-0092.sh | 19 +++++++++++++++++++
|
||||||
|
test/test-config.92.in | 4 ++++
|
||||||
|
6 files changed, 48 insertions(+), 4 deletions(-)
|
||||||
|
create mode 100755 test/test-0092.sh
|
||||||
|
create mode 100644 test/test-config.92.in
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index d3f2825..78153b3 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -2565,6 +2565,9 @@ static int writeState(const char *stateFilename)
|
||||||
|
|
||||||
|
close(fdcurr);
|
||||||
|
|
||||||
|
+ /* drop world-readable flag to prevent others from locking */
|
||||||
|
+ sb.st_mode &= ~(mode_t)S_IROTH;
|
||||||
|
+
|
||||||
|
fdsave = createOutputFile(tmpFilename, O_RDWR | O_CREAT | O_TRUNC, &sb, prev_acl, 0);
|
||||||
|
#ifdef WITH_ACL
|
||||||
|
if (prev_acl) {
|
||||||
|
@@ -2898,15 +2901,16 @@ static int readState(const char *stateFilename)
|
||||||
|
|
||||||
|
static int lockState(const char *stateFilename, int skip_state_lock)
|
||||||
|
{
|
||||||
|
+ struct stat sb;
|
||||||
|
int lockFd = open(stateFilename, O_RDWR | O_CLOEXEC);
|
||||||
|
if (lockFd == -1) {
|
||||||
|
if (errno == ENOENT) {
|
||||||
|
message(MESS_DEBUG, "Creating stub state file: %s\n",
|
||||||
|
stateFilename);
|
||||||
|
|
||||||
|
- /* create a stub state file with mode 0644 */
|
||||||
|
+ /* create a stub state file with mode 0640 */
|
||||||
|
lockFd = open(stateFilename, O_CREAT | O_EXCL | O_WRONLY,
|
||||||
|
- S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
|
||||||
|
+ S_IWUSR | S_IRUSR | S_IRGRP);
|
||||||
|
if (lockFd == -1) {
|
||||||
|
message(MESS_ERROR, "error creating stub state file %s: %s\n",
|
||||||
|
stateFilename, strerror(errno));
|
||||||
|
@@ -2926,6 +2930,22 @@ static int lockState(const char *stateFilename, int skip_state_lock)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (fstat(lockFd, &sb) == -1) {
|
||||||
|
+ message(MESS_ERROR, "error stat()ing state file %s: %s\n",
|
||||||
|
+ stateFilename, strerror(errno));
|
||||||
|
+ close(lockFd);
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (sb.st_mode & S_IROTH) {
|
||||||
|
+ message(MESS_ERROR, "state file %s is world-readable and thus can"
|
||||||
|
+ " be locked from other unprivileged users."
|
||||||
|
+ " Skipping lock acquisition...\n",
|
||||||
|
+ stateFilename);
|
||||||
|
+ close(lockFd);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (flock(lockFd, LOCK_EX | LOCK_NB) == -1) {
|
||||||
|
if (errno == EWOULDBLOCK) {
|
||||||
|
message(MESS_ERROR, "state file %s is already locked\n"
|
||||||
|
diff --git a/logrotate.spec.in b/logrotate.spec.in
|
||||||
|
index 92e1d97..3caabf2 100644
|
||||||
|
--- a/logrotate.spec.in
|
||||||
|
+++ b/logrotate.spec.in
|
||||||
|
@@ -41,7 +41,6 @@ install -p -m 644 examples/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotat
|
||||||
|
install -p -m 644 examples/btmp $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btmp
|
||||||
|
install -p -m 644 examples/wtmp $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/wtmp
|
||||||
|
install -p -m 755 examples/logrotate.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/logrotate
|
||||||
|
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/logrotate.status
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
@@ -55,4 +54,4 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
%attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
|
||||||
|
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
|
||||||
|
%attr(0755, root, root) %{_sysconfdir}/logrotate.d
|
||||||
|
-%attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
|
||||||
|
+%ghost %attr(0640, root, root) %verify(not size md5 mtime) %{_localstatedir}/lib/logrotate.status
|
||||||
|
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||||
|
index 914fe65..d6fb7c8 100644
|
||||||
|
--- a/test/Makefile.am
|
||||||
|
+++ b/test/Makefile.am
|
||||||
|
@@ -87,6 +87,7 @@ TEST_CASES = \
|
||||||
|
test-0086.sh \
|
||||||
|
test-0087.sh \
|
||||||
|
test-0088.sh \
|
||||||
|
+ test-0092.sh \
|
||||||
|
test-0100.sh \
|
||||||
|
test-0101.sh
|
||||||
|
|
||||||
|
diff --git a/test/test-0087.sh b/test/test-0087.sh
|
||||||
|
index 91e5266..aeff2c6 100755
|
||||||
|
--- a/test/test-0087.sh
|
||||||
|
+++ b/test/test-0087.sh
|
||||||
|
@@ -8,6 +8,7 @@ cleanup 87
|
||||||
|
preptest test.log 87 1
|
||||||
|
|
||||||
|
touch state
|
||||||
|
+chmod 0640 state
|
||||||
|
|
||||||
|
$RLR test-config.87 -f &
|
||||||
|
|
||||||
|
diff --git a/test/test-0092.sh b/test/test-0092.sh
|
||||||
|
new file mode 100755
|
||||||
|
index 0000000..be52e14
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/test-0092.sh
|
||||||
|
@@ -0,0 +1,19 @@
|
||||||
|
+#!/bin/sh
|
||||||
|
+
|
||||||
|
+. ./test-common.sh
|
||||||
|
+
|
||||||
|
+# check state file locking
|
||||||
|
+cleanup 92
|
||||||
|
+
|
||||||
|
+preptest test.log 92 1
|
||||||
|
+
|
||||||
|
+touch state
|
||||||
|
+chmod 0644 state
|
||||||
|
+flock state -c "sleep 10" &
|
||||||
|
+
|
||||||
|
+$RLR -f test-config.92 || exit 23
|
||||||
|
+
|
||||||
|
+checkoutput <<EOF
|
||||||
|
+test.log 0
|
||||||
|
+test.log.1 0 zero
|
||||||
|
+EOF
|
||||||
|
diff --git a/test/test-config.92.in b/test/test-config.92.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..ac93900
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/test-config.92.in
|
||||||
|
@@ -0,0 +1,4 @@
|
||||||
|
+&DIR&/test.log {
|
||||||
|
+ rotate 1
|
||||||
|
+ create
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.35.3
|
||||||
|
|
||||||
|
|
||||||
|
From 0d2d770cc5aa7bf14e84a2832249eeeb391b0b8a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Wed, 25 May 2022 09:55:02 +0200
|
||||||
|
Subject: [PATCH 2/3] drop world-readable permission on state file
|
||||||
|
|
||||||
|
... even when ACLs are enabled. This is a follow-up to the fix
|
||||||
|
of CVE-2022-1348. It has no impact on security but makes the state
|
||||||
|
file locking work again in more cases.
|
||||||
|
|
||||||
|
Closes: https://github.com/logrotate/logrotate/pull/446
|
||||||
|
|
||||||
|
Upstream-commit: addbd293242b0b78aa54f054e6c1d249451f137d
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 10 +++++++---
|
||||||
|
test/test-0048.sh | 1 +
|
||||||
|
2 files changed, 8 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index 78153b3..8d49f26 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -2498,6 +2498,7 @@ static int writeState(const char *stateFilename)
|
||||||
|
struct tm now;
|
||||||
|
time_t now_time, last_time;
|
||||||
|
char *prevCtx;
|
||||||
|
+ int force_mode = 0;
|
||||||
|
|
||||||
|
localtime_r(&nowSecs, &now);
|
||||||
|
|
||||||
|
@@ -2565,10 +2566,13 @@ static int writeState(const char *stateFilename)
|
||||||
|
|
||||||
|
close(fdcurr);
|
||||||
|
|
||||||
|
- /* drop world-readable flag to prevent others from locking */
|
||||||
|
- sb.st_mode &= ~(mode_t)S_IROTH;
|
||||||
|
+ if (sb.st_mode & (mode_t)S_IROTH) {
|
||||||
|
+ /* drop world-readable flag to prevent others from locking */
|
||||||
|
+ sb.st_mode &= ~(mode_t)S_IROTH;
|
||||||
|
+ force_mode = 1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- fdsave = createOutputFile(tmpFilename, O_RDWR | O_CREAT | O_TRUNC, &sb, prev_acl, 0);
|
||||||
|
+ fdsave = createOutputFile(tmpFilename, O_RDWR | O_CREAT | O_TRUNC, &sb, prev_acl, force_mode);
|
||||||
|
#ifdef WITH_ACL
|
||||||
|
if (prev_acl) {
|
||||||
|
acl_free(prev_acl);
|
||||||
|
diff --git a/test/test-0048.sh b/test/test-0048.sh
|
||||||
|
index 62d606b..06b255a 100755
|
||||||
|
--- a/test/test-0048.sh
|
||||||
|
+++ b/test/test-0048.sh
|
||||||
|
@@ -18,6 +18,7 @@ cat > state << EOF
|
||||||
|
logrotate state -- version 2
|
||||||
|
EOF
|
||||||
|
|
||||||
|
+chmod 0640 state
|
||||||
|
setfacl -m u:nobody:rwx state
|
||||||
|
|
||||||
|
$RLR test-config.48
|
||||||
|
--
|
||||||
|
2.35.3
|
||||||
|
|
||||||
|
|
||||||
|
From 105ed9f433a3aaf1aec93318aa9c8811b59d7b23 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Fri, 27 May 2022 09:56:07 +0200
|
||||||
|
Subject: [PATCH 3/3] lockState: do not print `error:` when exit code is
|
||||||
|
unaffected
|
||||||
|
|
||||||
|
Closes: https://github.com/logrotate/logrotate/pull/448
|
||||||
|
|
||||||
|
Upstream-commit: 31cf1099ab8514dfcae5a980bc77352edd5292f8
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
logrotate.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/logrotate.c b/logrotate.c
|
||||||
|
index 27deaf3..77db8c2 100644
|
||||||
|
--- a/logrotate.c
|
||||||
|
+++ b/logrotate.c
|
||||||
|
@@ -2942,8 +2942,8 @@ static int lockState(const char *stateFilename, int skip_state_lock)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sb.st_mode & S_IROTH) {
|
||||||
|
- message(MESS_ERROR, "state file %s is world-readable and thus can"
|
||||||
|
- " be locked from other unprivileged users."
|
||||||
|
+ message(MESS_NORMAL, "warning: state file %s is world-readable"
|
||||||
|
+ " and thus can be locked from other unprivileged users."
|
||||||
|
" Skipping lock acquisition...\n",
|
||||||
|
stateFilename);
|
||||||
|
close(lockFd);
|
||||||
|
--
|
||||||
|
2.35.3
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From a045dbad7370109a8ddf16a24090b8357a9b73fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Mon, 26 Aug 2019 15:13:16 +0200
|
|
||||||
Subject: [PATCH] examples/btmp: use create mode 0660
|
|
||||||
|
|
||||||
... to make the created file accessible by the utmp group.
|
|
||||||
|
|
||||||
Bug: https://bugzilla.redhat.com/1745330
|
|
||||||
Suggested-by: Steve Grubb
|
|
||||||
|
|
||||||
Closes #257
|
|
||||||
|
|
||||||
Upstream-commit: b1bddec3e73bff4282bcd4845f27ab7b375469da
|
|
||||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
---
|
|
||||||
examples/btmp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/examples/btmp b/examples/btmp
|
|
||||||
index 393ead5..0aa1ae1 100644
|
|
||||||
--- a/examples/btmp
|
|
||||||
+++ b/examples/btmp
|
|
||||||
@@ -2,6 +2,6 @@
|
|
||||||
/var/log/btmp {
|
|
||||||
missingok
|
|
||||||
monthly
|
|
||||||
- create 0600 root utmp
|
|
||||||
+ create 0660 root utmp
|
|
||||||
rotate 1
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
||||||
Loading…
Reference in new issue