path: root/net/bluetooth/smp.c
diff options
authorGuenter Roeck <linux@roeck-us.net>2020-04-06 11:54:38 -0700
committerMarcel Holtmann <marcel@holtmann.org>2020-04-07 18:34:53 +0200
commitd1d900f822b6b2874de9c1ef8094fc8df56a2f9f (patch)
treeefe738dad098341d42165ba2013b011c4280d8dd /net/bluetooth/smp.c
parentBluetooth: debugfs option to unset MITM flag (diff)
Bluetooth: Simplify / fix return values from tk_request
Some static checker run by 0day reports a variableScope warning. net/bluetooth/smp.c:870:6: warning: The scope of the variable 'err' can be reduced. [variableScope] There is no need for two separate variables holding return values. Stick with the existing variable. While at it, don't pre-initialize 'ret' because it is set in each code path. tk_request() is supposed to return a negative error code on errors, not a bluetooth return code. The calling code converts the return value to SMP_UNSPECIFIED if needed. Fixes: 92516cd97fd4 ("Bluetooth: Always request for user confirmation for Just Works") Cc: Sonny Sasaka <sonnysasaka@chromium.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org> Signed-off-by: Sonny Sasaka <sonnysasaka@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/smp.c')
1 files changed, 4 insertions, 5 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index a85e3e49cd0d..daf198fb2b31 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -854,8 +854,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
struct l2cap_chan *chan = conn->smp;
struct smp_chan *smp = chan->data;
u32 passkey = 0;
- int ret = 0;
- int err;
+ int ret;
/* Initialize key for JUST WORKS */
memset(smp->tk, 0, sizeof(smp->tk));
@@ -887,12 +886,12 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
/* If Just Works, Continue with Zero TK and ask user-space for
* confirmation */
if (smp->method == JUST_WORKS) {
- err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst,
+ ret = mgmt_user_confirm_request(hcon->hdev, &hcon->dst,
passkey, 1);
- if (err)
+ if (ret)
+ return ret;
set_bit(SMP_FLAG_WAIT_USER, &smp->flags);
return 0;