forked from pool/systemd
e7c96ab7f3
- Add patch 0001-bnc888612-logind-polkit-acpi.patch from Frederic to solve bnc#888612 - AUDIT-0: Power button press at gdm login should not prompt for credentials - Add upstream bugfix patches 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch 0003-mount-order-options-before-other-arguments-to-mount.patch 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch 0005-shared-label.h-add-missing-stdio.h-include.patch 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch 1081-udevd-check-return-of-various-functions.patch 1082-udevadm-hwdb-check-return-value-of-fseeko.patch 1083-udev-node-warn-if-chmod-chown-fails.patch 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch 1085-udev-fix-typos.patch 1086-udevd-don-t-fail-if-run-udev-exists.patch - Add upstream bugfix patches 0001-core-fix-resource-leak-in-manager_environment_add.patch 0002-util-remove-a-unnecessary-check.patch 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch 0004-shared-conf-parser.patch 0005-logind-fix-typo.patch 0006-systemctl-fix-resource-leak-CID-1237747.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patc OBS-URL: https://build.opensuse.org/request/show/250254 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=207
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From f901aaadd68050bc575c1c15b84f8f31fd4d494d Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Thu, 18 Sep 2014 19:16:54 +0200
|
|
Subject: [PATCH] udevadm: hwdb - check return value of fseeko()
|
|
|
|
Fonud by Coverity. Fixes CID #996255.
|
|
---
|
|
src/udev/udevadm-hwdb.c | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git src/udev/udevadm-hwdb.c src/udev/udevadm-hwdb.c
|
|
index 65cbf61..64273fb 100644
|
|
--- src/udev/udevadm-hwdb.c
|
|
+++ src/udev/udevadm-hwdb.c
|
|
@@ -365,7 +365,12 @@ static int trie_store(struct trie *trie, const char *filename) {
|
|
fchmod(fileno(t.f), 0444);
|
|
|
|
/* write nodes */
|
|
- fseeko(t.f, sizeof(struct trie_header_f), SEEK_SET);
|
|
+ err = fseeko(t.f, sizeof(struct trie_header_f), SEEK_SET);
|
|
+ if (err < 0) {
|
|
+ fclose(t.f);
|
|
+ unlink_noerrno(filename_tmp);
|
|
+ return -errno;
|
|
+ }
|
|
root_off = trie_store_nodes(&t, trie->root);
|
|
h.nodes_root_off = htole64(root_off);
|
|
pos = ftello(t.f);
|
|
@@ -378,7 +383,12 @@ static int trie_store(struct trie *trie, const char *filename) {
|
|
/* write header */
|
|
size = ftello(t.f);
|
|
h.file_size = htole64(size);
|
|
- fseeko(t.f, 0, SEEK_SET);
|
|
+ err = fseeko(t.f, 0, SEEK_SET);
|
|
+ if (err < 0) {
|
|
+ fclose(t.f);
|
|
+ unlink_noerrno(filename_tmp);
|
|
+ return -errno;
|
|
+ }
|
|
fwrite(&h, sizeof(struct trie_header_f), 1, t.f);
|
|
err = ferror(t.f);
|
|
if (err)
|
|
--
|
|
1.7.9.2
|
|
|