Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20200406184523.GA49680@roeck-us.net> <20200406185438.13576-1-sonnysasaka@chromium.org>
 <B002F0D0-77CA-4ED6-A810-9C8940D47A43@holtmann.org>
In-Reply-To: <B002F0D0-77CA-4ED6-A810-9C8940D47A43@holtmann.org>
From:   Sonny Sasaka <sonnysasaka@chromium.org>
Date:   Tue, 7 Apr 2020 09:42:20 -0700
Message-ID: <CAOxioN=gi+-ag4eHQah_8fQoyLO1s-asfpnqM7Yz-oU5YRsdug@mail.gmail.com>
Subject: Re: [PATCH] Bluetooth: Simplify / fix return values from tk_request
To:     Marcel Holtmann <marcel@holtmann.org>
Cc:     Bluez mailing list <linux-bluetooth@vger.kernel.org>,
        Guenter Roeck <linux@roeck-us.net>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Thanks, Marcel.

Thanks, Guenter for finding this out.

On Tue, Apr 7, 2020 at 9:35 AM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Sonny,
>
> > 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>
> > ---
> > net/bluetooth/smp.c | 9 ++++-----
> > 1 file changed, 4 insertions(+), 5 deletions(-)
>
> patch has been applied to bluetooth-next tree.
>
> Regards
>
> Marcel
>