Return-Path: <linux-bluetooth-owner@vger.kernel.org>
MIME-Version: 1.0
In-Reply-To: <CABBYNZ+ZntY4vr-Sk9OLtgvdgGRazzaFzpK5G3r+X0tZq4G10g@mail.gmail.com>
References: <CACgnnk=4aQiprXz1iY33kmPf2jYT=pPzr4c20N1n4Xt7m4322Q@mail.gmail.com>
 <CABBYNZ+ZntY4vr-Sk9OLtgvdgGRazzaFzpK5G3r+X0tZq4G10g@mail.gmail.com>
From: =?UTF-8?Q?Robert_Luba=C5=9B?= <robert.lubas@silvair.com>
Date: Fri, 16 Mar 2018 10:56:35 +0100
Message-ID: <CACgnnkmivLGAy7_YkoRgWCNR61rvr3CnQWNfKOWAWrBy4iRadA@mail.gmail.com>
Subject: Re: [PATCH BlueZ] mesh: Fix proxy PDU SAR msg length
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

Assignment outside if statement.
---
 mesh/gatt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mesh/gatt.c b/mesh/gatt.c
index 9116a9de1..693577a3a 100644
--- a/mesh/gatt.c
+++ b/mesh/gatt.c
@@ -383,7 +383,7 @@ static bool pipe_read(struct io *io, bool prov,
void *user_data)
        uint8_t buf[512];
        uint8_t *res;
        int fd =3D io_get_fd(io);
-       ssize_t len;
+       ssize_t len, len_sar;

        if (io !=3D notify_io)
                return true;
@@ -393,14 +393,14 @@ static bool pipe_read(struct io *io, bool prov,
void *user_data)
                        break;

                res =3D buf;
-               mesh_gatt_sar(&res, len);
-
-               if (prov)
-                       prov_data_ready(node, res, len);
-               else
-                       net_data_ready(res, len);
+               len_sar =3D mesh_gatt_sar(&res, len);
+               if (len_sar) {
+                       if (prov)
+                               prov_data_ready(node, res, len_sar);
+                       else
+                               net_data_ready(res, len_sar);
+               }
        }
-
        return true;
 }

2018-03-16 9:36 GMT+01:00 Luiz Augusto von Dentz <luiz.dentz@gmail.com>:
>
> Hi Robert,
>
> On Fri, Mar 16, 2018 at 10:14 AM, Robert Luba=C5=9B <robert.lubas@silvair=
.com> wrote:
> > In read_pipe function there was a mishandled case when the msg has
> > more than one segment. As a result e.g. after provisioning the
> > capabilities discovery was incorrect parsed.
> >
> > ---
> >  mesh/gatt.c | 15 +++++++--------
> >  1 file changed, 7 insertions(+), 8 deletions(-)
> >
> > diff --git a/mesh/gatt.c b/mesh/gatt.c
> > index 9116a9de1..8fecac10b 100644
> > --- a/mesh/gatt.c
> > +++ b/mesh/gatt.c
> > @@ -383,7 +383,7 @@ static bool pipe_read(struct io *io, bool prov,
> > void *user_data)
> >         uint8_t buf[512];
> >         uint8_t *res;
> >         int fd =3D io_get_fd(io);
> > -       ssize_t len;
> > +       ssize_t len, len_sar;
> >
> >         if (io !=3D notify_io)
> >                 return true;
> > @@ -393,14 +393,13 @@ static bool pipe_read(struct io *io, bool prov,
> > void *user_data)
> >                         break;
> >
> >                 res =3D buf;
> > -               mesh_gatt_sar(&res, len);
> > -
> > -               if (prov)
> > -                       prov_data_ready(node, res, len);
> > -               else
> > -                       net_data_ready(res, len);
> > +               if (len_sar =3D mesh_gatt_sar(&res, len)) {
>
> Leave the assignment outside of if statement like:
>
> len_sar =3D...
> if (len_sar)...
>
> > +                       if (prov)
> > +                               prov_data_ready(node, res, len_sar);
> > +                       else
> > +                               net_data_ready(res, len_sar);
> > +               }
> >         }
> > -
> >         return true;
> >  }
>
> Other than that it looks fine.
>
> --
> Luiz Augusto von Dentz