dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 01:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

dissect-image: also check devtype in device_is_partition()

Browse Source 
This should be mostly redundant. Just for safety.
This commit is contained in:
Yu Watanabe
2021-02-21 11:16:18 +09:00
parent 210e1cd6e6
commit 11368b694e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/dissect-image.c
View File

@@ -147,15 +147,18 @@ static int device_is_partition(sd_device *d, blkid_partition pp) {
blkid_loff_t bsize, bstart;
uint64_t size, start;
int partno, bpartno, r;
const char *ss, *v;
const char *v;
assert(d);
assert(pp);
r = sd_device_get_subsystem(d, &ss);
r = sd_device_get_subsystem(d, &v);
if (r < 0)
return r;
if (!streq(ss, "block"))
if (!streq(v, "block"))
return false;
if (sd_device_get_devtype(d, &v) < 0 || !streq(v, "partition"))
return false;
r = sd_device_get_sysattr_value(d, "partition", &v);