From patchwork Wed Feb 12 06:27:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13971044 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEEF2C0219E for ; Wed, 12 Feb 2025 06:33:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E02F280010; Wed, 12 Feb 2025 01:33:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7901F28000E; Wed, 12 Feb 2025 01:33:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62FEE280010; Wed, 12 Feb 2025 01:33:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3EADD28000E for ; Wed, 12 Feb 2025 01:33:25 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E75EDC0E56 for ; Wed, 12 Feb 2025 06:33:24 +0000 (UTC) X-FDA: 83110325928.21.C81E6A6 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf15.hostedemail.com (Postfix) with ESMTP id 1D7D3A0004 for ; Wed, 12 Feb 2025 06:33:22 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=CbaBgCeH; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.169 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739342003; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fDJRc+CzjHHBPozwYIKOoKTE7RtcGO1bK7SyyTKpM/I=; b=FjlkYQWgASybuY27Osrrt0MWufFDCh81WWFpajVsu/MSnvfVSn9ORX6Y2s+q7oubAsT5nC TBeH8vhM9ZPU4tgqKrOz/hA+Zl0+WwfvfmAr+CD1Jv3IzHd+gQC9QjaLKpYSXod9sj6gQq FQoXuv+X6kjratQWY0e0n7whcTDwAZw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=CbaBgCeH; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.169 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739342003; a=rsa-sha256; cv=none; b=o3ZWkS87FSIRZdQSb9M2t+aeXNPTozBWjThw5fnpVc5EPilc9PokQsTlzLKUU7AMyd7DCN qCpBZzYmCqfTJct4pv1yZJ3/2ojAn2hX+kPwFvTdlj6xGjKQ+NBXca5YBWUCRfe3mJx52a MOjJVg+yFIP3tUPTZP7CCCqcVHEryuc= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220bfdfb3f4so6552615ad.2 for ; Tue, 11 Feb 2025 22:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739342002; x=1739946802; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fDJRc+CzjHHBPozwYIKOoKTE7RtcGO1bK7SyyTKpM/I=; b=CbaBgCeHBxm61SjhoPCnz7v54FxQcu2lkhdjA2nB79kb6kmnXey6kwNkSQeFxI0m4L hrPxiSodgB9OH23Sad/jFKT7iXJB2efpIGwY8sdG0CyHN67Ute74LPL80mnwgbkoHwuz Rcuies9hoAv81L/w6SNuSxn6nEoKfKJGeMKmw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739342002; x=1739946802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fDJRc+CzjHHBPozwYIKOoKTE7RtcGO1bK7SyyTKpM/I=; b=jCnmKCGqNcio4eVsGOJCdEQEYr6PYI0k3fgfTXhziCgsOPjGp44F9d1a4RofmnAI47 fOaV1YXL5dxNGkfmr4JJCeOFOnNEHuBFyr/Xdjd8RBYYKWLsNajqaFBNzs68S10/Wl5s GoGNTLI/UcSFv+VVwyHpB3Z0k51/KVM6Js/bmXQXD/RDu6U6a7pZp271X5xaWt+OPUub N+xdTtFaF2OjzhtUbHF6wjG8XDlaozkluuDRZ3IFb45y+mGLmm06FkdzjsHWDegMDq2D c0O1r3oaH9E4ET5ccGgGt/Qc2nj2u51cYSXeqdl8lyPuF+SKuOD/Sz23jiqULj+GTv82 LVtA== X-Forwarded-Encrypted: i=1; AJvYcCU6Bzmag23vVRKwnGZ5lxIJHq6FNhydKEzSScKp7WHpqkiAuGCPjZjeXqc+UQtVgsRoQEpUw6QbOg==@kvack.org X-Gm-Message-State: AOJu0YzOCaMUCb9qeVN+QiV+5WT2ZHfpa2g56HQhPi4JRuvnMUeCiBdQ 0dzP9TQKb8OJxQ1bqttQaytAa+yD0gqZoppQY9MQ0verIBys3m7C+fKYX/TfQQ== X-Gm-Gg: ASbGnctqf1q2I9zawU5gWHD7SuqSrG2xdXsAL3sQgSHuvT6C/FnCP+p1cYjN0Dfq7iM l+RPNj/K0gJz8c8IzbAtLiSb7AzcL3pFgFkTaQJMwDZVpo3SgkeZkkbIuEmgO1tdLBwFKHekqEs wbBfHLNMtS36xNhDm7+4NzyOvr8YDdlzYo0nxdYUUQRJKtZBHCcXh3nzY/2WOM41JeeXGvPD28p 7NRyh7K0Rw9aFe81eCSuuRWIQU/W9MbsdWjbyiN6mgvej3hIPBLIN/Jzydw3+aG17J+VpcHJ2ge zIGxq20KICP5riaJ7g== X-Google-Smtp-Source: AGHT+IGOuYujF/oHMf514Cu6FZkIg94rGPYgxxAA4Ed/XcTGYHy4Z7A3N+oerldYL8V8e8DNCN1OUw== X-Received: by 2002:a17:902:da87:b0:216:3297:92a4 with SMTP id d9443c01a7336-220bbc73ab5mr34950945ad.46.1739342002127; Tue, 11 Feb 2025 22:33:22 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:69f5:6852:451e:8142]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21f3687bde1sm106393605ad.195.2025.02.11.22.33.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Feb 2025 22:33:21 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Kairui Song , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v5 16/18] zram: do not leak page on recompress_store error path Date: Wed, 12 Feb 2025 15:27:14 +0900 Message-ID: <20250212063153.179231-17-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250212063153.179231-1-senozhatsky@chromium.org> References: <20250212063153.179231-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1D7D3A0004 X-Stat-Signature: p7zzfmr8hrhaf8jxrz3f6f8pejkok8kt X-HE-Tag: 1739342002-179775 X-HE-Meta: U2FsdGVkX1+c3iRa6zZ0oz5TZ/BWbYVKCkLB8PX4UgSXp7esTjHEm1fmClfhEempPUpmkhhU35H8iPHHhHc4KYEzgVzkyGVsKzZY2OSP1b74szh59FOicdrh2JrMCgKbhJfCT+KM8TO6NwkC8m3M9KB7NwWr5AyBCfhdWuWusFxskx3EK9nUBDmkrp3jBjUF/ZJLCDmhm12KupwqnnS+KoeoU9MYPXk6eOUZOssnhE+ebSHL7UVUaXxEV6IKZzNAqaj0XoxDm6zye51SJNJvW9YR5hEJGa48NGEIIw0ss/OzIbz2z0/SXzU1cLSseS6MSDX9FSbygKXxhPWrVIr3rQ8E4NLihUDMQz/2trt+8l/Zg3rpRkGLcLmPYFXwlFGF82AZ7/Mr0e2aBhyJVCSZZum9C0iLWEH3rqFXD3J+ro5h9pt1FRjmDfd2v7p/wOyhfZFJNIi1ZSAUeV1ACga4of9Rym9u5+wQjvnkLq9bglml6C1KmO4bPn0j6LUjViA/kHN+UtrMM5jFEpTXeqzevqiEkwGiqE91XVHVTBrup2zPPB/Lk8/vt5H4dAVLatriqnnwtiGEeUHOSVB6WgnHuHzoVoXtmICOTUDc7gPbvvm1RmCyCUi0EiXhXc0HupF+y0ScW8WnR819034HbVRHQzwEBQd8i6rWOYLJPdgGpx8+MpAJ9P86GdPOsVj1i6VUIyJmhreeeL5CxeeUUXPeOQleGuIWdytoJ5AyXC9BF+SqOUfs9LY5hVMulSAV5zZS1bM4vO2ileTY513UKJcfs0YbSoNHs6bRL0QbVm1yetffHndlMziV7FdBG7+nH3yCsASK8X7yNiHqorP7sRVe9nzSdm5aDP3lw54oCoSeGO/883SFsfRt0uMxSTN+aMsmw1ylRgMvS9a2pAnplOPy/mK1QkuTudQUqtBeB/8N6UucX61QWlWqPznlnMJN/Qp5lF5sGH5ZubsJl5TSs2o T2VMR7Wn TTov2PITV8VPVQ4TtpIRbgodhdoh+OCN62Jz67x00m+BiIuV2TedkPkt2397m1sRiXAZ17IqOp1jGg6FcD1da5GHmicdsptPHJ+7lhbW8xyTjtIMyEEgFjRJ9X48KP6+p6EsPvTQifEzrX0EgZrk2Y151Oiw+b67XPtS4/0SteCJtz4nqIGp8BBZ8yXKn4vN/l48EOKXO3IY20SgZRsfjftUbD1sUt1glSemNdXwBT8VN+7AzsCBLSn9w9Rg9SL9+nq7tdtvYcWqDfO+XWosuPnkISNByFHzKYPLUW4Ac5FBrc0Gb9N9gQrfKSbkp/qBrq7Uxx6roW+AgviyLjJ6sYGmSVX8br7O5OTwIJX28j7behnA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Ensure the page used for local object data is freed on error out path. Fixes: 3f909a60cec1 ("zram: rework recompress target selection strategy") Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index c6310077c221..f4644c29f74e 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2017,7 +2017,7 @@ static ssize_t recompress_store(struct device *dev, struct zram_pp_slot *pps; u32 mode = 0, threshold = 0; u32 prio, prio_max; - struct page *page; + struct page *page = NULL; ssize_t ret; prio = ZRAM_SECONDARY_COMP; @@ -2161,9 +2161,9 @@ static ssize_t recompress_store(struct device *dev, cond_resched(); } - __free_page(page); - release_init_lock: + if (page) + __free_page(page); release_pp_ctl(zram, ctl); atomic_set(&zram->pp_in_progress, 0); up_read(&zram->init_lock);