SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25707 from yuwata/sd-device-fix-double-free

Browse Source 
sd-device: fix double-free
This commit is contained in:
Luca Boccassi
2022-12-12 13:26:42 +01:00
committed by GitHub
parent a0bccdd375 733529d812
commit 30338b8b66
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/sd-device.c
+7 -2
View File
@@ -2332,9 +2332,14 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr,
sysattr, value, ret_value ? "" : ", ignoring");
if (ret_value)
return r;
} else if (ret_value)
*ret_value = TAKE_PTR(value);
return 0;
}
if (ret_value)
*ret_value = value;
TAKE_PTR(value);
return 0;
}
src/libsystemd/sd-device/test-sd-device.c
+8 -7
View File
@@ -180,15 +180,16 @@ static void test_sd_device_one(sd_device *d) {
} else
assert_se(r == -ENOENT);
r = sd_device_get_sysattr_value(d, "name_assign_type", &val);
assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL));
if (r > 0) {
r = sd_device_get_sysattr_value(d, "nsid", NULL);
if (r >= 0) {
unsigned x;
assert_se(device_get_sysattr_unsigned(d, "name_assign_type", NULL) >= 0);
assert_se(device_get_sysattr_unsigned(d, "name_assign_type", &x) >= 0);
}
assert_se(device_get_sysattr_unsigned(d, "nsid", NULL) >= 0);
r = device_get_sysattr_unsigned(d, "nsid", &x);
assert_se(r >= 0);
assert_se((x > 0) == (r > 0));
} else
assert_se(ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL));
}
TEST(sd_device_enumerator_devices) {