From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <alexander.turenko@tarantool.org>
Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 82BE346970E
 for <tarantool-patches@dev.tarantool.org>;
 Wed, 15 Jan 2020 01:13:58 +0300 (MSK)
Date: Wed, 15 Jan 2020 01:14:00 +0300
From: Alexander Turenko <alexander.turenko@tarantool.org>
Message-ID: <20200114221359.hlbm3hj7u7c3544m@tkn_work_nb>
References: <20191129213905.36097-1-maria.khaydich@tarantool.org>
 <1575631765.615916554@f415.i.mail.ru>
 <20200113164548.GA2451@uranus>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20200113164548.GA2451@uranus>
Subject: Re: [Tarantool-patches] [PATCH] Memtx_tuple_delete used heap after
 free
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tarantool-patches@dev.tarantool.org

On Mon, Jan 13, 2020 at 07:45:48PM +0300, Cyrill Gorcunov wrote:
> On Fri, Dec 06, 2019 at 02:29:25PM +0300, Maria Khaydich wrote:
> >    Overlooked a better solution as @PersDep kindly suggested. Sending the
> >    fixed version. 
> >     
> >    Subject: [PATCH] Memtx_tuple_delete used heap after free
> >    Struct of type tuple_format is being passed as
> >    an argument to tuple_format_unref where it might
> >    be freed. On such occasion any further references
> >    to format fields should not take place.
> >     
> >    Closes #4658
> >    ---
> >    Issue:
> >    https://github.com/tarantool/tarantool/issues/4658
> >    Branch:
> >    https://github.com/tarantool/tarantool/compare/eljashm/gh-4658-heap-use-after-free
> >     
> >     src/box/memtx_engine.c | 2 +-
> >     1 file changed, 1 insertion(+), 1 deletion(-)
> >     
> >    diff --git a/src/box/memtx_engine.c b/src/box/memtx_engine.c
> >    index 23ccc4703..4da80824a 100644
> >    --- a/src/box/memtx_engine.c
> >    +++ b/src/box/memtx_engine.c
> >    @@ -1177,7 +1177,6 @@ memtx_tuple_delete(struct tuple_format *format,
> >    struct tuple *tuple)
> >         struct memtx_engine *memtx = (struct memtx_engine *)format->engine;
> >         say_debug("%s(%p)", __func__, tuple);
> >         assert(tuple->refs == 0);
> >    -    tuple_format_unref(format);
> >         struct memtx_tuple *memtx_tuple =
> >             container_of(tuple, struct memtx_tuple, base);
> >         size_t total = tuple_size(tuple) + offsetof(struct memtx_tuple,
> >    base);
> >    @@ -1187,6 +1186,7 @@ memtx_tuple_delete(struct tuple_format *format,
> >    struct tuple *tuple)
> >             smfree(&memtx->alloc, memtx_tuple, total);
> >         else
> >             smfree_delayed(&memtx->alloc, memtx_tuple, total);
> >    +    tuple_format_unref(format);
> >     }
> 
> So we basically defer unref.
> Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>

LGTM too (it was already pushed to the master, but I looked anyway).

> 
> FWIW the use after free introduced by the commit f9299c43d4fcc918a98c45563a5f96bb13863337

Added to the issue just in case.

WBR, Alexander Turenko.