Page MenuHomeFreeBSD
Files F147316399

D36899.id111577.diff
No OneTemporary
Actions

D36899.id111577.diff
View Options

diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -5303,27 +5303,25 @@
bus_data_generation_update();
}
-static char *
-device_get_path(device_t dev, const char *locator)
+static int
+device_get_path(device_t dev, const char *locator, struct sbuf *sb)
{
- struct sbuf *sb;
- ssize_t len;
- char *rv = NULL;
- int error;
+ device_t parent;
+ int error, error1;
- sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND | SBUF_INCLUDENUL);
- error = BUS_GET_DEVICE_PATH(device_get_parent(dev), dev, locator, sb);
- sbuf_finish(sb); /* Note: errors checked with sbuf_len() below */
- if (error != 0)
- goto out;
- len = sbuf_len(sb);
- if (len <= 1)
- goto out;
- rv = malloc(len, M_BUS, M_NOWAIT);
- memcpy(rv, sbuf_data(sb), len);
-out:
- sbuf_delete(sb);
- return (rv);
+ parent = device_get_parent(dev);
+ if (parent == NULL)
+ parent = dev;
+ error = BUS_GET_DEVICE_PATH(parent, dev, locator, sb);
+ if (error == 0) {
+ error1 = sbuf_error(sb);
+ if (error1 != 0)
+ error = error1;
+ else if (sbuf_len(sb) <= 1)
+ error = EIO;
+ }
+ sbuf_finish(sb);
+ return (error);
}
static int
@@ -5586,26 +5584,28 @@
req->dr_flags);
break;
case DEV_GET_PATH: {
+ struct sbuf *sb;
char locator[64];
- char *path;
ssize_t len;
- error = copyinstr(req->dr_buffer.buffer, locator, sizeof(locator), NULL);
- if (error)
- break;
- path = device_get_path(dev, locator);
- if (path == NULL) {
- error = ENOMEM;
+ error = copyinstr(req->dr_buffer.buffer, locator,
+ sizeof(locator), NULL);
+ if (error != 0)
break;
+ sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND |
+ SBUF_INCLUDENUL /* | SBUF_WAITOK */);
+ error = device_get_path(dev, locator, sb);
+ if (error == 0) {
+ len = sbuf_len(sb);
+ if (req->dr_buffer.length < len) {
+ error = ENAMETOOLONG;
+ } else {
+ error = copyout(sbuf_data(sb),
+ req->dr_buffer.buffer, len);
+ }
+ req->dr_buffer.length = len;
}
- len = strlen(path) + 1;
- if (req->dr_buffer.length < len) {
- error = ENAMETOOLONG;
- } else {
- error = copyout(path, req->dr_buffer.buffer, len);
- }
- req->dr_buffer.length = len;
- free(path, M_BUS);
+ sbuf_delete(sb);
break;
}
}
@@ -5697,11 +5697,13 @@
}
bool
-dev_wired_cache_match(device_location_cache_t *dcp, device_t dev, const char *at)
+dev_wired_cache_match(device_location_cache_t *dcp, device_t dev,
+ const char *at)
{
- const char *cp, *path;
+ struct sbuf *sb;
+ const char *cp;
char locator[32];
- int len;
+ int error, len;
struct device_location_node *res;
cp = strchr(at, ':');
@@ -5714,13 +5716,22 @@
locator[len] = '\0';
cp++;
+ error = 0;
/* maybe cache this inside device_t and look that up, but not yet */
res = dev_wired_cache_lookup(dcp, locator);
if (res == NULL) {
- path = device_get_path(dev, locator);
- res = dev_wired_cache_add(dcp, locator, path);
+ sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND |
+ SBUF_INCLUDENUL | SBUF_NOWAIT);
+ if (sb != NULL) {
+ error = device_get_path(dev, locator, sb);
+ if (error == 0) {
+ res = dev_wired_cache_add(dcp, locator,
+ sbuf_data(sb));
+ }
+ sbuf_delete(sb);
+ }
}
- if (res == NULL || res->dln_path == NULL)
+ if (error != 0 || res == NULL || res->dln_path == NULL)
return (false);
return (strcmp(res->dln_path, cp) == 0);

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 10, 10:05 PM (19 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29515255
Default Alt Text
D36899.id111577.diff (3 KB)

Event Timeline