OSDN Git Service

block: bfq: swap puts in bfqg_and_blkg_put
authorKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Thu, 6 Sep 2018 08:05:44 +0000 (11:05 +0300)
committerJens Axboe <axboe@kernel.dk>
Thu, 6 Sep 2018 17:32:58 +0000 (11:32 -0600)
Fix trivial use-after-free. This could be last reference to bfqg.

Fixes: 8f9bebc33dd7 ("block, bfq: access and cache blkg data only when safe")
Acked-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-cgroup.c

index 58c6efa..9fe5952 100644 (file)
@@ -275,9 +275,9 @@ static void bfqg_and_blkg_get(struct bfq_group *bfqg)
 
 void bfqg_and_blkg_put(struct bfq_group *bfqg)
 {
-       bfqg_put(bfqg);
-
        blkg_put(bfqg_to_blkg(bfqg));
+
+       bfqg_put(bfqg);
 }
 
 /* @stats = 0 */