Message ID | 20250221222958.2225035-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 6AF01C021B5 for <linux-mm@archiver.kernel.org>; Fri, 21 Feb 2025 22:31:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00C13280011; Fri, 21 Feb 2025 17:31:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EFEA928000F; Fri, 21 Feb 2025 17:31:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7777280011; Fri, 21 Feb 2025 17:31:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B7B2F28000F for <linux-mm@kvack.org>; Fri, 21 Feb 2025 17:31:41 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 749971A0873 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 22:31:41 +0000 (UTC) X-FDA: 83145400002.14.047D59F Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf04.hostedemail.com (Postfix) with ESMTP id 8B24340004 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 22:31:39 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=ZxLw7oJf; spf=pass (imf04.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.176 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=1740177099; 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=JR4o+z78q2mq61XCgJA6k+y16NepOIdls2rvyffegGo=; b=mQQmwEJSUkQTorICtcx8g2WG7GJVYRY+wEveGmfMtMHXO9cZUxmfkO780IRJIB+xpoifNV pZ7a7L75fObT59arKC7G22Lo3GnxOk5jezlxOG+baLYQhl8qbxmksWgihGyw60Ll3fkKPr Kuud/LkvsuTAwwGrB29puCpce8RDChk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=ZxLw7oJf; spf=pass (imf04.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.176 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=1740177099; a=rsa-sha256; cv=none; b=de2zNAIQ4+9S4HTUS2wrDwPjyXMlX+CVpxVcHk/Ra/CsUX1WXz+vDaKVbrS7GMXa9OOCOi Cll3B3bPsUo9xHMmJ/bwNMFkfh93BATyJMxGlw5E4ahQeYCjp5k2Iix3DWYqyM8gn5Y4eS 8O4hXawHkREBGh5bbrsm5MUVxa+Yprc= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22104c4de96so47053475ad.3 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 14:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740177098; x=1740781898; 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=JR4o+z78q2mq61XCgJA6k+y16NepOIdls2rvyffegGo=; b=ZxLw7oJfArESg1mr6eD31DzRxvU4R7WlLVSlcgXtVj5AEzl4Vn9BUWVazEiUhFE792 9itjEBndW2G1QMhS0IV8JRzC7lBx7e03jwABIArkOGervIm/YQmdDkY4gErXT1URfRTa zvfENsQACXdTyBwcFbKyh5v0cdx+DyjlhTEtM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740177098; x=1740781898; 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=JR4o+z78q2mq61XCgJA6k+y16NepOIdls2rvyffegGo=; b=KMy1kuujQSMzPIQEVkkduZ/JoRFOxTtqgCXwj4zR6FKTcZmmXdTyh+FFhThtYESQcO Dk+TcDUi/+FkOQhUn/Juna6HaKz3TxnjW7rsdrOVjeOqnGSXwfR6Uf/3n/hiRriCxFo9 u0hQ1FRMRmSgjzCi/3gcTRbp+6A1g6JMJA/in5+iJTJSsTWzB0cLvq06Q/kmcuqdAV3E OnVgpd2EN6O0RaguQTxOx0YTv5qzlg6kwyEtxgyPK9ZjEWarWlKXhNlGdO3JEbfHtfP0 U3AmFk/BMNPaHalfeLeX4fIhjgfII4vqqZMRyaGe32lX88u8qtZbSie4QxirswMf+BFX 0BsA== X-Forwarded-Encrypted: i=1; AJvYcCV/De2L6t67TtTSoCPfLtNUfCllKvy+sTj7h/BcDXU16lOAJYO52N7bV885B2NfsT0UZgh9p7juhQ==@kvack.org X-Gm-Message-State: AOJu0YwBFmebl0/tacVndI03rpzr5xXygB8i9v+Ec77zywx9kWE8L+IA m0gBchPM+YcPo/qgRypiF7c4lnNGArqAPszS/XAUP8MBgk+udSgehJY/0U7zRQ== X-Gm-Gg: ASbGncvZaYyK3P+4LXNrRsgbv4FgtjclBbAaZ58jbqkaRBh621XJNKJ/hkLocoh1xwg 9XZ4FTC+ngBWbpO/voy4yRKKpnGl1SjQuU/RwuSkdxgmqjTP0tELFKbnhCWE8A5GVQO2XUr2669 ljkopf0yslm9tRo0naawG1VyYT2S2VxrLdenbuGRX7N+88vxl3H451ltaw+qIJFGqZmBq83p/bX tR7VkjgOqzQFfUWbqHQ8SG4ndMTi+D5oKGfiHU8QImzfFwk2NLi+uq04y5FLIANvCJA/noldf3m pC0g0ZZNJNNpJV2V4wGMrxv/bMA= X-Google-Smtp-Source: AGHT+IGz76l7D3zW41L+K8j03WiqF3YSL7loobTRLV3etxTMk2gUtAOA9cHRBz1EbaHcXZjvwLcRjA== X-Received: by 2002:a05:6a00:a01:b0:72f:d7ce:5003 with SMTP id d2e1a72fcca58-73426d9059bmr6835280b3a.22.1740177098531; Fri, 21 Feb 2025 14:31:38 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73242546867sm16266956b3a.24.2025.02.21.14.31.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 14:31:38 -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 v8 16/17] zram: do not leak page on writeback_store error path Date: Sat, 22 Feb 2025 07:25:47 +0900 Message-ID: <20250221222958.2225035-17-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221222958.2225035-1-senozhatsky@chromium.org> References: <20250221222958.2225035-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 8B24340004 X-Stat-Signature: mzziuteeb5oio6zukhp9oqxo9pd455xe X-HE-Tag: 1740177099-458359 X-HE-Meta: U2FsdGVkX1/+ei8Obb53tbfbImWmrYNOeYHCE06SLamRRjDjFhOc8KAxKKXLvWGSYQE5TVS0UQ1bSQkcyb1HQ4kKqI97SUeBm14nTf2EMWNxnbhXVQdm5wfe/b0wW5nqgHsc3tAGryLk35K+I+i/spB4EyBB7oJHJy5YHOS1P+yAFwBTzMpGRSVl8EfnnY9LaXeALYl7VRyC/GD0r4OFEnzPcru4d6Ji4BiIat2RUuaogP3sQlBjoUq6JItoAmCTa2/OYh/LFRrLKdYOsZnEIiLihpInGrwKtteyNfkw5Dr6rK3GeKlXPvUyaQcEahyPvyxSE5CITltlZL3m3mFFwJ0yHNt4rbpGvG1CDo30K8Enh/bGVVBTN6RvcvTpLLcUw6DrV3BpUx6io9LES+srVNS+H7yVKdRrtIen0S+aXDCdni0YAodPTRBdQQM0Mang0ot57VpOOqKdIjZIcYJclC+udp8Xf8tzzU+QxW2pipjZnU9ni6FFdzYJKV55Wx4x3QJRhyprlk7Z11Hy0Vz0mrmNTflxmAsd1qSoXHCGC3WVpq69bp3lDqerqmO1WxWLiZdzYTXcP2BLTLusIjxM/zvictz8xMidt36uXLXjArwjIYJouGul2CmpauVtAcQ4E65u6Mf/OVwL9ig/TMQNtXAd9dfzaw6QajduUPcSqSZ8ANQi30dHWemuO44zJnO3wPwZccKxUPr3oNEuofSsZqcmGLe1M9vYb75yYEU5PB6UZxVGgLqfJaVff9buOVSomPzX5TaKUj+R7iZCwp9CgDvaImEI7zQpEjevO2nu4Lo2WyfrrC603BmirbHxT0cM8/XjsK2wJZlCwIEQrEw7lGtQ9Wd7LMWQHnt5zPIg3ckqTD5grEiAuoFWOEtgNkvWFnbQPtTQ8pQxKOhNKHhwqc5xBXhg23/jKrEdYkDNTJFnOng4pJQyi709Xc9x8Cyuv9ixmz5YJtwq3H/aiSf 7GQxvRyi UkfKMaefJy8khx2mbGpLUV+GIFpx7bLraMIvnBwsh78I9E1ycsIpp7F3kj+0Ykm8m3ZdJVGb7rZzfndj2bkt/80+uS1tHztVJ1bYdhRCKrW5WQffqZJLVdmKyJCiVBkLvqAGAxtO2vV3jgi8qCzHRnZfcp26hp4ysF9suBQ2KK/miPptN1SMcZQd9JYfVx+Zepx7TJ9l+z5TjnLKnnwbTf3RMFridXJ7MD4pKSV/AyyfuYZDgE70qzcuwsrPg+yvOGstPIIQiKlibMUb38+GPUR8Xn3aT8J1wmSsG0M+WncMViRUqkSJ/uo8DBn1z1nB6XneLa9zFlhlY0bciqFSLNDXQb5RAB6HA9FbjqvGK3oTM+rM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000873, 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 1da329cae8ce..4e9381b153da 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(-)