Message ID | 20250221093832.1949691-17-senozhatsky@chromium.org (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 B8209C021AA for <linux-mm@archiver.kernel.org>; Fri, 21 Feb 2025 09:40:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48CFD280010; Fri, 21 Feb 2025 04:40:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 416ED28000B; Fri, 21 Feb 2025 04:40:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28CB8280010; Fri, 21 Feb 2025 04:40:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 06A8E28000B for <linux-mm@kvack.org>; Fri, 21 Feb 2025 04:40:17 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B04AA120B83 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 09:40:16 +0000 (UTC) X-FDA: 83143456032.05.BC61825 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf13.hostedemail.com (Postfix) with ESMTP id CD75520002 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 09:40:14 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=H3sJZf1r; spf=pass (imf13.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.174 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=1740130814; 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=0hGRfBbi2fKBhcLL3toY8LXz3XIHS2H2SZvxy9aDrUM=; b=lJHVfH1vha5lcGh9utbVj+1Mia/mQkrFsYB2EfqSm8CrxXuXJKlueC5PToKBRgDhKc/39z yt1A5EfniGMG88x8oueuVWcO/Bw2WA877ATOkgq0UZ4lq6dRLjpksOzvbKkDjTF4gUi59o kriIgz5okhMRfwLk+sUTBpCG4nK3kAg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=H3sJZf1r; spf=pass (imf13.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.174 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=1740130814; a=rsa-sha256; cv=none; b=oDxmw/lKF4Dt9fR84+4BmWd8t6DF5+2U85hkapDt1jAM1s4NSo1tzmuxHH9BaixjeDzGTV 1bpycXCTIDj1QHjq1d9b/0WwE25JTUa0Kz5Jq915rsLewY5LTPyLQDjIQfCCVXy0BHlLSM QcvkJkmcXVVhE8eQYZFsE+BoS6ySQPk= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-220c8eb195aso40122135ad.0 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 01:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130814; x=1740735614; 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=0hGRfBbi2fKBhcLL3toY8LXz3XIHS2H2SZvxy9aDrUM=; b=H3sJZf1r6Q1P3T6pevjCtHrl7LcdMfjgYkg9x56OLGm7SRN1JJS4QTyL7sXH+nEzfl Nwkz1nOxLSLJ7t3Yfp3t/k0VvJd5XBDuoDbque+s6Ubd1RAUqnbHPG6jliqmfwAKMaEZ WOApHVSYYFbkCQXKHjU95L7dqzqvVMr4aRHLs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130814; x=1740735614; 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=0hGRfBbi2fKBhcLL3toY8LXz3XIHS2H2SZvxy9aDrUM=; b=i9K3PVvEiR0mznbEGAcFvP9zvcARLY0p+dvNzyduqD8to1ORxA3SgHQ2d32I1DwFgt WDmT4lIx4YHyCRBBeW2OhsrdcJqQFtKevYoYEX2B2hxcbiFn9P6hTgEZNQ6GWAzhv/5X 4UBpCRyf4cZYh0JTYS2AiMrzOePn4IqMdIjhnYlucqnxNUVhtoLXtBPrXNd1F88oWsMQ tiOVH/ZxeQ2KIhbh41pT5axF2mLxV2CEd3tSCve/tfARwJtfN1XhefbEsMsM07QPr0fZ 4yyVGiIRYsPwx1cIMbRsDwneSjDKjlKrIywT+OHByP9BQdqF+7HZ8xo3Eh0KDA40glQr H+rQ== X-Forwarded-Encrypted: i=1; AJvYcCW5Ihq3itZX+d83w957yeU3h1DSfh21n0rHs50h4iyRins6I8mH+XarmNO53FTWUgrWvlYquy2JJw==@kvack.org X-Gm-Message-State: AOJu0YwBkR9ZdN+PHmMZP26ZAA4qhiFARhTLXpU9h0qgZB5kNzkwSGUs lI8mY3IH5jg1v6qATrQmzY5rKWgcQCWSuxGGfXTOc8yDoFySgGaoaWmGWzvWbBtK/PEmyT6DvtM = X-Gm-Gg: ASbGncs8gSeJU9+HIHbj+LJrHDyzd+FZDaA0TB97ORuGoIK/NSxRnEQH9w7aevi3dMA QAnO0ek37y42oPMNpuW1rOzQzTHOBxg0vrQbWftBHfBj5NPXmlCcAWsInrrfn19jwuxpLuDuysk zrscm9ZnvCFBcRCuDS2ZLEGJdD87amraaIL+zP4ZYEueyCVN76B+dKNngpDcbQDber9f10r+0Ai CtQrD36zS2F4RANDJZZ/h4TI9pkDvIihfwUgrk5P0vLdZGKMAA3egiLgpHF2bo7NsJYqnOffUWq L4Unef6SsmYvG8LpDRQFVhV57/w= X-Google-Smtp-Source: AGHT+IHnD4WYtByveH7o9SWK4ZPshLs+PqzDTaY7xc5G/UiEwzsRQaEFLwJdetxPgoe922xVEvOq1g== X-Received: by 2002:a17:902:e892:b0:220:fae9:8a6 with SMTP id d9443c01a7336-2219ff3127emr51606815ad.4.1740130813846; Fri, 21 Feb 2025 01:40:13 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d545d051sm131952525ad.108.2025.02.21.01.40.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:40:13 -0800 (PST) From: Sergey Senozhatsky <senozhatsky@chromium.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Yosry Ahmed <yosry.ahmed@linux.dev>, Hillf Danton <hdanton@sina.com>, Kairui Song <ryncsn@gmail.com>, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, Minchan Kim <minchan@kernel.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <senozhatsky@chromium.org> Subject: [PATCH v7 16/17] zram: do not leak page on writeback_store error path Date: Fri, 21 Feb 2025 18:38:09 +0900 Message-ID: <20250221093832.1949691-17-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CD75520002 X-Stat-Signature: 7bf8k7ag6q16xj3oxcamy3s36x6q4uai X-Rspam-User: X-HE-Tag: 1740130814-714112 X-HE-Meta: U2FsdGVkX19jLXqkquNk+dIJdkQfQRmnR0foJUoNyAqWXUq+ME6ERtq8OWuFY3/VVkOIK1WvtuTMlIpgdd5iR21RUiCRweLFT91Wz8UZJpYhJnn1bxFbJu65qtKnMCr4Yy3ojfdWFPytCN7gancvh8BP9+6H6oiXjSuJEvH3ho+mWWvC9gT4CLRgJ1Fij/RHk0FkfL2EPNReyMGGY3KA9X3QKNtggfnIk2wF3arGK11Tew+gFhHeQQDC+aOh/+ZeN6HPi/7vQygOf69Ki/TTDdZqJPP+UUeJOtWu/ck+4COeuFm/Gk53Wyn6+lY24tVJgLvt0dXP5tFBPuBnAydBWA+LqBZOr6J31PtLOSyLXG4V2Iy7IgjELdGOkG1JQ7W5dtuINKOOev9KXZuhoXoNExGyHd30FkPHrAjRLqAanW6u8DYrlN3LG8r4LkwywwzO+q2N+8BcogN+nGLnf9UinUHDKnAD/plH1PFbSYeD0OaYB0Wgr/mM/7S1qvAFAx8ZURGbZOw4cnxlnNoLyzzGFfTX+XiQ8kgGt/jzE8ZkHnHbyGxmLlICtkUvoYwMlGruNuHSsB/5L9rBHOjsU5RwnyLFyDqanJ5OISf/obyNvfYIWHkESUlokwVPWAMwkH+ZqXAB6j4J4MGBAiOlpeenI2DZkoA1+GhMbXh1FY+5OEYiQRAiS/RLN9SMSsdzUDY3BqdIeZAd5r8WKC7uRvDMQv3EOOHZYiULk9bG1tuKeUjvLii4/QsaMIsCBQa180rKMnux+wM2HtCV/Nuv4+kkl0ROjzTWIgMlDpjwOBGLAi6A81Tu2aAHyaw/+G7z9gJ6MFZ91YZ6uhGkgQLlMrml418udgczxNfSZSBbhCv3PA3w8Qr88LJnllECu6EGbD553bJ/KfyVFE6BbByJZuv+bHtIkbMHCUqOKT9rKMSPFalvAmb7bjcViE6K5LkeoWryDylQJ3/bN3vgpDM/B5L n9beXCB7 yLipakpboQvnpw7gbXcBwrJjlM9GCb8LCfW3mAMU0SSgCnbjkkjkQ+vH9sYKkZU7OnwdLCpK+vbr4HmzWFDZ568lE10/0SpVYBlhccNBhemiVEB954XI2OnBxk9sgpG3W/wxd65lxGqhrNNFfjaocmDv2RqSEiXlMjnBQgZqL3f4FQa48vG0L6ftbOtSPhr1s9DyHx8lifpxv2LyEXLQIwc18WYxw5ISlKWThrRgT+wD7WJvw1iQ/xD3QVrOiQU0+pK2TO3WUJnqksokMQi2gbCv4/ZbZ6TXmvN6z7tXlS6Tz8ibiWhUvErroY0qUXfNLrZ/7gZ3HH9+DBD0gyquIRSCqOwQgaXjWf5gjKD/sSMayB3g= 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
zsmalloc/zram: there be preemption
|
expand
|
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 48639a48ddb8..7a5c5b861fe5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -792,7 +792,7 @@ static ssize_t writeback_store(struct device *dev, unsigned long index = 0; struct bio bio; struct bio_vec bio_vec; - struct page *page; + struct page *page = NULL; ssize_t ret = len; int mode, err; unsigned long blk_idx = 0; @@ -934,8 +934,10 @@ static ssize_t writeback_store(struct device *dev, if (blk_idx) free_block_bdev(zram, blk_idx); - __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);
Ensure the page used for local object data is freed on error out path. Fixes: 330edc2bc059 (zram: rework writeback target selection strategy) Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org> --- drivers/block/zram/zram_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)