Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP4:Update
efivar.20186
efivar-bsc1187386-fix-emmc-parsing.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File efivar-bsc1187386-fix-emmc-parsing.patch of Package efivar.20186
From 046f92b28c1d8114307b4588ee4ff33b8bab5904 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Wed, 22 Apr 2020 19:33:01 +0200 Subject: [PATCH] Fix /sys/block sysfs parsing for eMMC-s Commit 471869409464 ("sysfs parsers: make all the /sys/block link parsers work the same way") has broken sysfs parsing for eMMC-s when the passed in path points to the whole block device. In that case pos2 will stay at its -1 initializaton value, because we only do 4 conversions; and when we then do: current += pos2 We end up moving current one char position backwards and we end up returning -1. The correct position to use is always pos1 independent if we got passed the whole disk; or a partition, as we always want to return only the part which points to whole disk which ends at pos1. Note that it seems that before commit 471869409464, the case where path points to the partition was likely broken as the old code then would return the entire path including the partition element. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1826864 Signed-off-by: Hans de Goede <hdegoede@redhat.com> (cherry picked from commit f0d3ed17ef3b2bbdfdff4dde12ec0a82d1ccdd33) --- src/linux-emmc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/linux-emmc.c b/src/linux-emmc.c index bafa9cd..b68c51a 100644 --- a/src/linux-emmc.c +++ b/src/linux-emmc.c @@ -70,13 +70,10 @@ parse_emmc(struct device *dev, const char *path, const char *root UNUSED) dev->emmc_info.slot_id = slot_id; dev->interface_type = emmc; - if (rc == 6) { - if (dev->part == -1) - dev->part = partition; + if (rc == 6 && dev->part == -1) + dev->part = partition; - pos2 = pos1; - } - current += pos2; + current += pos1; debug("current:'%s' sz:%zd", current, current - path); return current - path; -- 2.31.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor