diff options
| author | Nikola Pajkovsky <npajkovs@redhat.com> | 2010-11-25 12:14:48 +0100 |
|---|---|---|
| committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2010-11-25 12:14:48 +0100 |
| commit | 74c0a596d5b679237c1f3fba90e076a90a3b009b (patch) | |
| tree | 7c06503d72a00a3f04f37526b63286d029b42ed1 /lib/Plugins/KerneloopsScanner.cpp | |
| parent | c10a64020b11dac3438210a067ef73e674fea2ca (diff) | |
| download | abrt-74c0a596d5b679237c1f3fba90e076a90a3b009b.tar.gz abrt-74c0a596d5b679237c1f3fba90e076a90a3b009b.tar.xz abrt-74c0a596d5b679237c1f3fba90e076a90a3b009b.zip | |
backport: taint flag is decimal representation of a bitmask
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
Diffstat (limited to 'lib/Plugins/KerneloopsScanner.cpp')
| -rw-r--r-- | lib/Plugins/KerneloopsScanner.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp index 3731959b..6e685044 100644 --- a/lib/Plugins/KerneloopsScanner.cpp +++ b/lib/Plugins/KerneloopsScanner.cpp @@ -122,16 +122,12 @@ void save_oops_to_debug_dump(const vector_string_t& oopsList) VERB1 log("Saving %u oopses as crash dump dirs", idx >= countdown ? countdown-1 : idx); - char tainted[2] = {'x', '\0'}; - /* once tainted flag is set to 1, only restart can reset the flag to 0 */ - int tainted_fd = open("/proc/sys/kernel/tainted", O_RDONLY); - if (tainted_fd > 0) + char *tainted_str = NULL; + FILE *tainted_fd = fopen("/proc/sys/kernel/tainted", "r"); + if (tainted_fd) { - /* contain only 0 or 1 */ - if (read(tainted_fd, &tainted, 1) != 1) - error_msg("Unable to read one byte from /proc/sys/kernel/tainted"); - - close(tainted_fd); + tainted_str = xmalloc_fgetline(tainted_fd); + fclose(tainted_fd); } else error_msg("/proc/sys/kernel/tainted does not exist"); @@ -157,8 +153,8 @@ void save_oops_to_debug_dump(const vector_string_t& oopsList) /* Optional, makes generated bz more informative */ strchrnul(second_line, '\n')[0] = '\0'; dd.SaveText(FILENAME_REASON, second_line); - if (tainted[0] == '1') - dd.SaveText(FILENAME_TAINTED, tainted); + if (tainted_str[0] == '1') + dd.SaveText(FILENAME_TAINTED, tainted_str); } catch (CABRTException& e) { |