From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFCFD5695 for ; Mon, 27 Oct 2025 15:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761577738; cv=none; b=o9PteIvpN3rUj4DxU9m2qYieWt8Ly5SebqBqawL9zPLyhG5H5+u9kQK4hI7MWSIZsM2h0M9gYH71NqvlS0R2xDiTUqx9OUc0KnAr3uyGJAYH/9Y0rDWlHC9plGdaQF8TXDdTBonefBgQdl/ptnTwx75kvzcGDNrG/0kTDpz/cmY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761577738; c=relaxed/simple; bh=E6TanHOEWRAN+pm6bYT8hZApuV50k09I3qBAuiVZgYY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cgxBbEvzu+ikl9bsAplB5nzF+OVMST+Kf46OikY8xjCfi94NMbSHddVRdCBhiaAUS6BuUCEKEpzWhivhXqhf1dV9DjtaJu6qewJAIEcJk2JTPi+6SFQwc9jHkthJsLT2pKA7vnd0wWBVTOMM3XlmtEF9ybUMU9J/gp4foI1SfcY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mtT8YkLa; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mtT8YkLa" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b6cee846998so3217416a12.1 for ; Mon, 27 Oct 2025 08:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761577736; x=1762182536; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CWC5gkPdxGSTgxFMIx5rrToJ8P8ezVw3vUIN7VkwkFM=; b=mtT8YkLaF20/D627XKTVaexicqyuPSry97S638w8M3Pv6rEIFZb52oEHUiI97c1cS2 gzkRyuVa5qhodO48bqXGfRmN40FNV7+OUZeeKs5Uku+5sTjSeGHXeFnbnKsQS11MLYCm LM4/neskhqzXvSDnUdWRKs46yz/glsqfd5WdH1nuRvt16KGgpRc9JUbi7jD7VsMOUMP5 XOLXY+2TVyrKcpuBe516tYlVF/fsQjxflUe/4OR6aVtINDLrlDZbjYGIATpqD5MHZjIB fgCr9VnHMAO4CJ0K6uq0riu812ZaXAd2dpzjsAl839oyme0old1ZTHQSu7gKZutQ0pcK K1TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761577736; x=1762182536; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CWC5gkPdxGSTgxFMIx5rrToJ8P8ezVw3vUIN7VkwkFM=; b=E077s78j+b8GvOdJpA94xXSmDhCDMbxaQrU3TsE/iyL/2Xp/z6JWit5f4jEyvR65pT HTLkIl4MLkNIbUiWp0q1xMlxRJvEyHfs90snFvCJdhFEGrA8Osmcj6O44VaOkBLjebgB szVsZjTlhkh7D+vs3QB5DKDKtTDSAelCtcbpywrO9HirbH4wllEvA5Hk47SGFzxNNW8u zkzBMzWh8UWSTWq8seW1HElfKWb0Vhkbv5rw8GpmNlaPV0KYXjlP5lAfCKTc3PPwcUlC 8kIp97tqVn9YFyoDzbMdtt/fkCBbbZkM539sB5ZkWmJIQGRAI0eKu3nHaOlX6mbMnVVm 4bEg== X-Forwarded-Encrypted: i=1; AJvYcCUJUKKkqiWOG9VmMHk5L5B+Tnfc6TmuvxzLW5qs4y8mdHID8wwM5JC0uNZqiTGUntNZDI7ns2U=@vger.kernel.org X-Gm-Message-State: AOJu0YztAlc1GsFf3FEsupQtKu/R/j1g3y3gQTGGgPFDd4zJKP7Gi7we fTwfqfkshsCJfKCHqI3H2ZFnD08f2BJfa1MYxhu0m63bJvN6mlIzeK7s X-Gm-Gg: ASbGncsYbRHT1om4xtqWi1A9gd6rO3ujVD/5kvq/5v28rBKyqlz/WDRZhufW6ljZOnk Fbbv+YODjpM5Evt50jxKyk8g04PDGYkWTtaav/J07IqMYzeWuFYc3GIZTVJ4olIwbGLA4XSpBtD Poh6gCx+kth5NEBN1HjWS5Pz7CBXzcSra7BErR3SMbhy8NeU5sNgfjxCn/b4M2bLzRdLyqbYhzw 7zSyzI92tn4F6MxselncIKsfVukWGrtYe2g8a2Y/6sBiCOFS2EmfM3KlmfD+puJUlTE0C2HwB5N NVuD0s6V5yGXnus/UJcqwTdW+p/ZV6C09WnPIfrFooMEixFY9bnislPINVCL/BRpeK3eAsS5kCD svD28fjJK25pHyM/YnXvT8GUY3BDntluIkm/CarW4wzKYcLZWh2VGbkWJfhDfSRzL0Q7inE5ixD CmSzbwYI30TpSFaTsD3C1KvOzJQJb2gcrn X-Google-Smtp-Source: AGHT+IFHIscxo7imWnRY5urYdW89HjcRlzIelV1JJZA81YcKKcZ25FMolijoFKaqSlkIM5bdPfTYvw== X-Received: by 2002:a17:902:f68b:b0:27e:f1d1:74e0 with SMTP id d9443c01a7336-294cb37a547mr2902695ad.17.1761577736199; Mon, 27 Oct 2025 08:08:56 -0700 (PDT) Received: from localhost.localdomain ([124.77.218.104]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-29498cf358fsm84405955ad.20.2025.10.27.08.08.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Oct 2025 08:08:54 -0700 (PDT) From: Miaoqian Lin To: Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: linmq006@gmail.com, stable@vger.kernel.org Subject: [PATCH v2] s390/mm: Fix memory leak in add_marker() when kvrealloc fails Date: Mon, 27 Oct 2025 23:08:38 +0800 Message-Id: <20251027150838.59571-1-linmq006@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The function has a memory leak when kvrealloc() fails. The function directly assigns NULL to the markers pointer, losing the reference to the previously allocated memory. This causes kvfree() in pt_dump_init() to free NULL instead of the leaked memory. Fix by: 1. Using kvrealloc() uniformly for all allocations 2. Using a temporary variable to preserve the original pointer until allocation succeeds 3. Removing the error path that sets markers_cnt=0 to keep consistency between markers and markers_cnt Found via static analysis and this is similar to commit 42378a9ca553 ("bpf, verifier: Fix memory leak in array reallocation for stack state") Fixes: d0e7915d2ad3 ("s390/mm/ptdump: Generate address marker array dynamically") Cc: stable@vger.kernel.org Signed-off-by: Miaoqian Lin --- changes in v2: - update the fixing logic to prevent memory leak in v1 v1 link: https://lore.kernel.org/all/20251026091351.36275-1-linmq006@gmail.com/ --- arch/s390/mm/dump_pagetables.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c index 9af2aae0a515..ab0c1fcf2782 100644 --- a/arch/s390/mm/dump_pagetables.c +++ b/arch/s390/mm/dump_pagetables.c @@ -291,16 +291,15 @@ static int ptdump_cmp(const void *a, const void *b) static int add_marker(unsigned long start, unsigned long end, const char *name) { - size_t oldsize, newsize; - - oldsize = markers_cnt * sizeof(*markers); - newsize = oldsize + 2 * sizeof(*markers); - if (!oldsize) - markers = kvmalloc(newsize, GFP_KERNEL); - else - markers = kvrealloc(markers, newsize, GFP_KERNEL); - if (!markers) - goto error; + struct addr_marker *new_markers; + size_t newsize; + + newsize = (markers_cnt + 2) * sizeof(*markers); + new_markers = kvrealloc(markers, newsize, GFP_KERNEL); + if (!new_markers) + return -ENOMEM; + + markers = new_markers; markers[markers_cnt].is_start = 1; markers[markers_cnt].start_address = start; markers[markers_cnt].size = end - start; @@ -312,9 +311,6 @@ static int add_marker(unsigned long start, unsigned long end, const char *name) markers[markers_cnt].name = name; markers_cnt++; return 0; -error: - markers_cnt = 0; - return -ENOMEM; } static int pt_dump_init(void) -- 2.39.5 (Apple Git-154)