From: Emmanuel Garette <egarette@cadoles.com>
Date: Thu, 30 Apr 2020 07:51:29 +0000 (+0200)
Subject: repart: fix partition maximum size segfault
X-Git-Tag: v246-rc1~462
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db1442260a56963a8aa507787e71b97e5f08f17c;p=thirdparty%2Fsystemd.git

repart: fix partition maximum size segfault

Discovered, tracked down and fix proposed by Emmanuel Garette.

See: https://lists.freedesktop.org/archives/systemd-devel/2020-April/044435.html

(Lennart turned this into a PR)

Fixes: #15608
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 3bbc8da3f18..bc9b12f167b 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -714,7 +714,7 @@ static int context_grow_partitions_on_free_area(Context *context, FreeArea *a) {
                         assert(p->new_size != UINT64_MAX);
                         m = p->new_size + span;
 
-                        xsz = partition_max_size(a->after);
+                        xsz = partition_max_size(p);
                         if (xsz != UINT64_MAX && m > xsz)
                                 m = xsz;