]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix -Wuse-after-free warning in dbuf_issue_final_prefetch_done()
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 20 Jun 2022 21:32:03 +0000 (21:32 +0000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 27 Jun 2022 21:19:19 +0000 (14:19 -0700)
Move the use of the private pointer after it is freed.  It's only
used as a tag so a dereference would never occur, but there's no
harm in inverting the order to resolve the warning.

    module/zfs/dbuf.c: In function 'dbuf_issue_final_prefetch_done':
    module/zfs/dbuf.c:3204:17: error:
    pointer 'private' may be used after 'free' [-Werror=use-after-free]

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13528
Closes #13575

module/zfs/dbuf.c

index 55a3686fac46d2bb3d70af30b7dacc5ba0f32b6b..71b2b0992765ceb4177f23a8e2bd629e9bcef886 100644 (file)
@@ -3199,9 +3199,10 @@ dbuf_issue_final_prefetch_done(zio_t *zio, const zbookmark_phys_t *zb,
        (void) zio, (void) zb, (void) iobp;
        dbuf_prefetch_arg_t *dpa = private;
 
-       dbuf_prefetch_fini(dpa, B_TRUE);
        if (abuf != NULL)
                arc_buf_destroy(abuf, private);
+
+       dbuf_prefetch_fini(dpa, B_TRUE);
 }
 
 /*