From: Filipe Brandenburger <filbranden@google.com>
Date: Thu, 7 Jun 2018 20:07:56 +0000 (-0700)
Subject: udev: fix usage of udev_device_new_from_stat_rdev() in journalctl
X-Git-Tag: v239~119
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=fffafb2b5e521476bdd911ed0cc64909cfc0cf5f

udev: fix usage of udev_device_new_from_stat_rdev() in journalctl

The refactor in #9200 inadvertently dropped the variable assignment to
traverse the device and its hierarchy in add_matches_for_device().

This was uncovered by Coverity (CID #1393310).

Fix that by restoring the assignment.

Tested: `journalctl /dev/sda` now filters journalctl output again.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 9ad1b31fa34..696abcd4505 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -207,6 +207,7 @@ static int add_matches_for_device(sd_journal *j, const char *devpath) {
         if (r < 0)
                 return log_error_errno(r, "Failed to get udev device from devnum %u:%u: %m", major(st.st_rdev), minor(st.st_rdev));
 
+        d = device;
         while (d) {
                 _cleanup_free_ char *match = NULL;
                 const char *subsys, *sysname, *devnode;