Re: wip-msgr2

[Luis Henriques <lhenriques@suse.de>]

(Ups!  Looks like this email never left my drafts maildir.)

Ilya Dryomov <idryomov@gmail.com> writes:

> On Thu, Dec 17, 2020 at 5:45 PM Luis Henriques <lhenriques@suse.de> wrote:
>>
>> Ilya Dryomov <idryomov@gmail.com> writes:
>> <snip>
>> >
>> > Ah, I disabled KASAN for some performance testing and didn't turn
>> > it back on.  This doesn't actually corrupt any memory because the
>> > 96-byte object that gets allocated is big enough.  In fact, the
>> > relevant code used to request 96 bytes independent of the connection
>> > mode until I changed it to follow the on-wire format more strictly.
>> >
>> > This frame is 68 bytes in plane mode and 96 bytes in secure mode
>> > but we are requesting 68 bytes in both modes.  The following should
>> > fix it:
>> >
>> > diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
>> > index 5e38c847317b..11fd47b36fc8 100644
>> > --- a/net/ceph/messenger_v2.c
>> > +++ b/net/ceph/messenger_v2.c
>> > @@ -1333,7 +1333,8 @@ static int prepare_auth_signature(struct
>> > ceph_connection *con)
>> >         void *buf;
>> >         int ret;
>> >
>> > -       buf = alloc_conn_buf(con, head_onwire_len(SHA256_DIGEST_SIZE, false));
>> > +       buf = alloc_conn_buf(con, head_onwire_len(SHA256_DIGEST_SIZE,
>> > +                                                 con_secure(con)));
>> >         if (!buf)
>> >                 return -ENOMEM;
>>
>> Looks like this fix didn't made it into your pull-request.  Did it just
>> fell through the cracks, or is this fixed somewhere else on the code?
>
> No, it didn't, it's in the testing branch:
>
>   https://github.com/ceph/ceph-client/commit/add7ad675cd1bdaf2751da1af9295fb43896da66

Cool, thanks for confirming.  Just wanted to make sure ;-)

Cheers,
-- 
Luis