Release v1.12.3

This release fixes a buffer overrun issue in the klogscanner. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Fix max number of bytes read by SYSLOG_ACTION_READ
2026-09-01 11:15:51 +00:00 · 2017-06-20 15:41:00 -07:00 · 2017-06-20 12:22:34 -07:00 · 2017-06-20 12:22:34 -07:00 · 2017-06-20 12:22:34 -07:00
2 changed files with 4 additions and 5 deletions
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ([2.69])
-AC_INIT([telemetrics-client], [1.12.2], [https://clearlinux.org/])
+AC_INIT([telemetrics-client], [1.12.3], [https://clearlinux.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.14 -Wall -Werror -Wno-extra-portability foreign subdir-objects])
 AM_SILENT_RULES([yes])
@@ -23,7 +23,6 @@ int main(void)
        char *bufp = NULL;
        size_t buflen = 0;
        int bytes = 0;
-        int loopcount = 0;

        oops_parser_init(write_oops_to_file);

@@ -45,13 +44,13 @@ int main(void)
                // Gets the size of the kernel ring buffer
                log_size = klogctl(SYSLOG_ACTION_SIZE_BUFFER, NULL, 0);
                if (log_size < 0) {
-                        telem_log(LOG_ERR, "Cannot read size of kernel ring buffer\n");
+                        telem_log(LOG_ERR, "Cannot read size of kernel ring buffer: %s\n", strerror(errno));
                        return 1;
                }

                buflen = (size_t)log_size;

-                if (loopcount++ > 0 && buflen > MAX_BUF) {
+                if (buflen > MAX_BUF) {
                        buflen = MAX_BUF;
                }

@@ -59,7 +58,7 @@ int main(void)
                bufp = (char *)calloc(buflen, sizeof(char));

                malloc_trim(0);
-                bytes = klogctl(SYSLOG_ACTION_READ, bufp, log_size);
+                bytes = klogctl(SYSLOG_ACTION_READ, bufp, (int)buflen);
                if (bytes < 0) {
                        telem_log(LOG_ERR, "Cannot read contents of kernel ring buffer: %s\n", strerror(errno));
                        return 1;
Author	SHA1	Message	Date
Patrick McCarty	f2aa671513	Release v1.12.3 This release fixes a buffer overrun issue in the klogscanner. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2017-06-20 15:41:00 -07:00
Patrick McCarty	a1fcf14c3d	Fix max number of bytes read by SYSLOG_ACTION_READ In case the value returned by SYSLOG_ACTION_SIZE_BUFFER exceeds MAX_BUF, the buffer later allocated has size MAX_BUF, but SYSLOG_ACTION_READ may read more than MAX_BUF bytes to store in the buffer, leading to a buffer overrun. Fix the issue by ensuring SYSLOG_ACTION_READ reads at most "buflen" bytes, the size of the allocated buffer. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2017-06-20 12:22:34 -07:00
Patrick McCarty	ad8209115f	Enforce buffer length cap on first loop iteration Since loopsize is initialized to 0, the conditional statement where loopsize increments led to the buffer size check not being executed the first time through the loop. Simply remove the counter variable to fix the issue. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2017-06-20 12:22:34 -07:00
Patrick McCarty	fdb2fa0463	Print specific error for SYSLOG_ACTION_SIZE_BUFFER query failure Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2017-06-20 12:22:34 -07:00