korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 00:04:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

mesh: Add validation of Device UUID value

Browse Source 
Validate that the value of Device UUID supplied in
CreateNetwork/Join/Import methods is compliant with RFC 4122.
This commit is contained in:
Inga Stotland 2021-02-12 13:42:42 -08:00 committed by Brian Gix
parent 400e738bf0
commit bc65e8840d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -134,7 +134,8 @@ ell_headers = ell/util.h \
ell/base64.h \
ell/asn1-private.h \
ell/cert-private.h \
ell/pem-private.h
ell/pem-private.h \
ell/uuid.h
ell_sources = ell/private.h ell/missing.h \
ell/util.c \
@ -169,7 +170,8 @@ ell_sources = ell/private.h ell/missing.h \
ell/gvariant-private.h \
ell/gvariant-util.c \
ell/siphash-private.h \
ell/siphash.c
ell/siphash.c \
ell/uuid.c
ell_libell_internal_la_SOURCES = $(ell_headers) $(ell_sources)
endif

18
mesh/mesh.c
View File

@ -533,7 +533,7 @@ static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
void *user_data)
{
const char *app_path, *sender;
struct l_dbus_message_iter iter_uuid;
struct l_dbus_message_iter iter;
uint32_t n;
l_debug("Join network request");
@ -543,14 +543,13 @@ static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
"Provisioning in progress");
if (!l_dbus_message_get_arguments(msg, "oay", &app_path,
&iter_uuid))
&iter))
return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
join_pending = l_new(struct join_data, 1);
if (!l_dbus_message_iter_get_fixed_array(&iter_uuid,
&join_pending->uuid, &n)
|| n != 16) {
if (!l_dbus_message_iter_get_fixed_array(&iter, &join_pending->uuid, &n)
|| n != 16 || !l_uuid_is_valid(join_pending->uuid)) {
l_free(join_pending);
join_pending = NULL;
return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
@ -785,8 +784,8 @@ static struct l_dbus_message *create_network_call(struct l_dbus *dbus,
&iter_uuid))
return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
if (!l_dbus_message_iter_get_fixed_array(&iter_uuid, &uuid, &n)
|| n != 16)
if (!l_dbus_message_iter_get_fixed_array(&iter_uuid, &uuid, &n) ||
n != 16 || !l_uuid_is_valid(uuid))
return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
"Bad device UUID");
@ -835,8 +834,9 @@ static struct l_dbus_message *import_call(struct l_dbus *dbus,
return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
if (!l_dbus_message_iter_get_fixed_array(&iter_uuid, &uuid, &n) ||
n != 16)
return dbus_error(msg, MESH_ERROR_INVALID_ARGS, "Bad dev UUID");
n != 16 || !l_uuid_is_valid(uuid))
return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
"Bad device UUID");
if (node_find_by_uuid(uuid))
return dbus_error(msg, MESH_ERROR_ALREADY_EXISTS,