summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-security.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-08-19 14:17:20 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-08-19 14:17:20 +0000
commit8803412684f97a032fceb0318a07e4969761a281 (patch)
tree1cca01656b2463aff68ac7e80ca85d00ef8dc3fb /hcid/dbus-security.c
parent67f57bda5344038e57ca0ca3e22594ef84f041ea (diff)
Refuse zero-length passkeys
Diffstat (limited to 'hcid/dbus-security.c')
-rw-r--r--hcid/dbus-security.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index d757100a..1495e44a 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -49,6 +49,7 @@ static void passkey_agent_free(struct passkey_agent *agent)
if (!agent)
return;
+
if (agent->name)
free(agent->name);
if (agent->path)
@@ -368,9 +369,7 @@ static void passkey_agent_reply(DBusPendingCall *call, void *user_data)
error("Passkey agent replied with an error: %s, %s",
err.name, err.message);
dbus_error_free(&err);
- hci_send_cmd(req->dev, OGF_LINK_CTL,
- OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
- goto done;
+ goto fail;
}
dbus_error_init(&err);
@@ -379,16 +378,14 @@ static void passkey_agent_reply(DBusPendingCall *call, void *user_data)
DBUS_TYPE_INVALID)) {
error("Wrong passkey reply signature: %s", err.message);
dbus_error_free(&err);
- hci_send_cmd(req->dev, OGF_LINK_CTL,
- OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
- goto done;
+ goto fail;
}
len = strlen(pin);
- if (len > 16) {
- error("Too long (%d char) passkey from handler", len);
- goto done;
+ if (len > 16 || len < 1) {
+ error("Invalid passkey length from handler");
+ goto fail;
}
set_pin_length(&req->sba, len);
@@ -400,6 +397,12 @@ static void passkey_agent_reply(DBusPendingCall *call, void *user_data)
hci_send_cmd(req->dev, OGF_LINK_CTL,
OCF_PIN_CODE_REPLY, PIN_CODE_REPLY_CP_SIZE, &pr);
+ goto done;
+
+fail:
+ hci_send_cmd(req->dev, OGF_LINK_CTL,
+ OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+
done:
if (message)
dbus_message_unref(message);