Max/pumpitupdev_pumptools
1
0
Fork 0
mirror of https://github.com/pumpitupdev/pumptools.git synced 2026-09-29 18:27:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correctly parse USB bus path on yet again newer kernels

Browse Source 
The Pro USB profile hook currently accepts only one 12-component sysfs path layout and reads the USB bus-port identifier from a fixed token. Systems that include an additional PCI topology component produce a 13-component path, shifting the identifier and preventing an assigned profile drive from being recognized.

Accept both observed path depths, validate block/<device> relative to the end of the path, and locate the USB bus-port token instead of assuming one fixed position. Existing 12-component paths remain supported; this change is limited to the shared Pro USB path parser.

Cherry-picked from PR #68 while preserving the original author.
This commit is contained in:
Filip Kolinsky
2026-09-28 17:13:15 +02:00
committed by voidderef
parent 49d7de7a39
commit 5ff38cc6fb
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/hook/propatch/usb-fix.c
+25 -5
View File
@@ -1,5 +1,6 @@
#define LOG_MODULE "usb-fix"
#include <ctype.h>
#include <unistd.h>
#include "capnhook/hook/lib.h"
@@ -69,9 +70,12 @@ ssize_t propatch_usb_fix_readlink(const char *path, char *buf, size_t len)
toks = util_str_split(buf, "/", &count);
log_debug("Parsing USB device path with %zu tokens", count);
// some sanity checks to ensure the format isn't different
if (count != 12 || strcmp(toks[0], "..") != 0 ||
strcmp(toks[1], "devices") != 0 || strcmp(toks[10], "block") != 0) {
// The format can vary between 12 and 13 tokens depending on USB hierarchy depth
if (count < 12 || count > 13 || strcmp(toks[0], "..") != 0 ||
strcmp(toks[1], "devices") != 0 || strcmp(toks[count-2], "block") != 0) {
log_error(
"/sys/block device readlink format changed, usb thumb drive "
"profiles will likely not work!: %s",
@@ -82,10 +86,26 @@ ssize_t propatch_usb_fix_readlink(const char *path, char *buf, size_t len)
int bus;
int port;
const char *device = toks[11];
const char *device = toks[count-1];
if (sscanf(toks[5], "%d-%d", &bus, &port) != 2) {
log_error("Parsing bus-port of %s failed", buf);
// Find the USB device identifier token (format: X-Y or X-Y.Z or X-Y.Z.W etc.)
// It should be one of the tokens that starts with a digit and contains a dash
bool found_usb_id = false;
for (size_t i = 4; i < count - 3; i++) { // Skip initial path components and final ones
if (isdigit(toks[i][0]) && strchr(toks[i], '-')) {
log_debug("Checking USB identifier token[%zu]: %s", i, toks[i]);
// Try to parse the main bus-port from this token
char *dash_pos = strchr(toks[i], '-');
if (dash_pos && sscanf(toks[i], "%d-%d", &bus, &port) == 2) {
log_debug("Successfully parsed USB bus %d, port %d from token: %s", bus, port, toks[i]);
found_usb_id = true;
break;
}
}
}
if (!found_usb_id) {
log_error("Could not find valid USB bus-port identifier in path: %s", buf);
util_str_free_split(toks, count);
return 0;
}