Message ID | 20250221093832.1949691-16-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 7B743C021AA for <linux-mm@archiver.kernel.org>; Fri, 21 Feb 2025 09:40:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E0F828000F; Fri, 21 Feb 2025 04:40:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 043F028000B; Fri, 21 Feb 2025 04:40:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD70D28000F; Fri, 21 Feb 2025 04:40:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B233328000B for <linux-mm@kvack.org>; Fri, 21 Feb 2025 04:40:09 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6C8FF120BB5 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 09:40:09 +0000 (UTC) X-FDA: 83143455738.12.F3C850E Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf11.hostedemail.com (Postfix) with ESMTP id 8763D4000C for <linux-mm@kvack.org>; Fri, 21 Feb 2025 09:40:07 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=fzqUw2M0; spf=pass (imf11.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.170 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=1740130807; 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=X/8bmw52gxKP9HlvW7ud00ppVmPtFMCISSlcsi1PIXo=; b=XLxIpD57YutxMZ/0FGVp5w0BwF65Bv8iptLa4LdL2pBZF9IyeHy7Mpo6xdtOvSjT5096JC jQFz8UpcYLsmqoKAWqfuO7+RMG1rnxqaX/azoCzTDAfLUleks9jn2q0z3H4nvHMxpj41wX d7mkkiQ8rSq6so4e2CS9WAoUTw9hWo4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=fzqUw2M0; spf=pass (imf11.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.170 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=1740130807; a=rsa-sha256; cv=none; b=QyumnQc7hGYISGEalMq2F1LWzOpYH53sX3d3B8j+QVnP/L1rxKmBleATBOFwYDqz0SW1ZR vjxVx8Eb+ohMp+ceWdl4xhbrQwpHJ1yHx9g+VWztpEXz3i0LsRXXQU9J0X13xZrip56h8t k4s29tkbwHoaqjB5fx8Brur2IBR/nS8= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-220f048c038so34300935ad.2 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 01:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130806; x=1740735606; 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=X/8bmw52gxKP9HlvW7ud00ppVmPtFMCISSlcsi1PIXo=; b=fzqUw2M0ifr5O9nUAm9bYjlwxgqf2+0BYv88F7DUs6AQwRDG+Yq9uj7CxXPTC4PY29 AHB2BhhwaebdNo4iuvTWwNr57p1g9acVQH/HH5ps+VN6wjdmUutDMv9n7xDr1CEbuXgr 6dsD1pa4nnm2CRXV7r7VYZ4vMnEoVr2EfviQM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130806; x=1740735606; 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=X/8bmw52gxKP9HlvW7ud00ppVmPtFMCISSlcsi1PIXo=; b=ll8QDzu1NPUYNb91xW0iBvk9DqSRTTfcpakgmbDAKFuMwfIwdtY0SFlv669Fmjcnzc dur4FgZaA7eaIald+QakoeHjNqUMKXvamFCh4LHrlcfowZHBFGJr2UTY/zjAJT+8JIi1 /VtX61+E2wBVZaowsrsNKJLM5GX1U9JQjbBY9bFhrpzwPggkNyMO/zUK/D03eY+cX4A5 7utfHOT3toBc3Wo25N8+zz+cFMw2QcvuK9DD/p/UEABakpIiEYVKVyFS3XvCyFwgAMVy Q+EdvYjs1cWQv+M3c4BnBwLod7FcybnNW3BXh/7L5QBlXoM3uhUwO9XcJHROMH4tOMrq I3HQ== X-Forwarded-Encrypted: i=1; AJvYcCUKI2cQl30jzABW9ONHWZhIb5jsSLHcA5cuwkVwbqa3v/Ue4/6p4yekIvd9b6uAdu3y4zXTz3ID6g==@kvack.org X-Gm-Message-State: AOJu0Yw6ZOmNdeZj+cJgxJAEG0AQvV0YvDfp4BNn2jbhkDMRTMHh5fEy zzZRTNNE0+YUAGiQRiCL0siPezMMDRMRZJwAG8v0pzV7MsH34V5UnfbVOwaMbA== X-Gm-Gg: ASbGnct1wOPqKZFhzHcbZ/c21Ubl3tf4NoOOGDYk/kmob+pgY+bUaRreJbci4HI2Xoa Dx3hQcraR9FJPipaYmtSO8tIXoLY5IeTqhPKWl360ZUHxpjSirhlhwWnWtc5y5iI1hr5Z1a695M iyDR26HBMjS0x4edveYkyLFtcUIHhPkkErB25heaIXFW0bXderEX9Q5E9oNTnMT+DwwdXNP2xQo ONmE01dOohkHKMcnKcS7Fp55gieRprAT0dnDJam6Q//AZ2RKra/nNuRl0lL8FlPlXU/n/n5wrFs fb6lxAoA+jlaDu6ceJ/FJLHRL1o= X-Google-Smtp-Source: AGHT+IFiDsUOFrogVCXhwG7jE5UhzUG2HXzmhm8iuLxdnK1gwrZ2PnYz7hKVVRLeqXubsVEuTmgEmg== X-Received: by 2002:a05:6a00:c89:b0:730:91fc:f9c9 with SMTP id d2e1a72fcca58-73426d6b971mr4177006b3a.16.1740130806309; Fri, 21 Feb 2025 01:40:06 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73242568aaasm15111670b3a.41.2025.02.21.01.40.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:40:06 -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 15/17] zram: do not leak page on recompress_store error path Date: Fri, 21 Feb 2025 18:38:08 +0900 Message-ID: <20250221093832.1949691-16-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-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 8763D4000C X-Stat-Signature: czxaqmxdj9q7s7tgy3udi4ursrgzwm9a X-HE-Tag: 1740130807-839103 X-HE-Meta: U2FsdGVkX19LJgAw8NrLfQ7jd+RyWIRCnAujWM+BvF44JPgogPSz089I7487qsTiYEUzbF38WGBLDEZv31U1e7c6D0zTO3+NlHiF1L6lEwnSzCr2cE3agm/Xs8LiWiKeJHfSEUNAxY6inD0Ljy0xRGgAFCBAqYw1Vx8pjnrGjkoBdcABcZtXtjhQ2FtGDtCA3ZlzrZYS8SRpLh/qLo8f+TtFezBsoeh8Yd12Se4MVArZBDb52FMVcPl0oazQp5FaJLJlExGThUWmqGJad4GPAaKE+j4KGKLXfijpQ8Uok7kzDwY2wMv0qs50mw97tZ5o6JPtXAVobmeMvbmoX6n8ZgBEcF7zGjb+Hqdd8hfh0CylPQ8ObK9/8srFkVJA04zvDzAX7m/DZpJkDlEPg3BpP8ac6lxzzSX9SseCid/lxjHNAn/FMGzb4g+y3+Uj2BuuFZWfHiFyBRC0KniWmzvsil1f355VrIxfhWgc6xXWGpMGM8pOy55jcFyUp/ZZlw+jklOhY2HPDQhCYiy7QK+cKFNARvdbvNhHERs3p8g0Fre8wpNoDiW0FGqd88guMAVdJJj1PWCXxYZJnfYP9TzZLYvO2u2b0IIU9g3ATV+ERzcHiv+3E1Ryw/RHzttxXu2oWdKVBstE+diVJDrwBdPzJDgEXEpaDMPvtE/GgW1b576NHeoxYzBTP1Q3wbGW6G2sU6Ha5he5N9jNaOSE1mgISojPS1L2GA1E1j0DI2mxv1wpyxg1ty12gbSeXcuqvJdIaqhaYYXxH+jq6PiEtEvgX1ylONSs+HNSfOcSej5j/C13rK1LkSIh7gEYlDnNiBFOdn7Qs8DFa4sgEX5dtAAVFHb2OrG63Axh58i/VFMcofilqNeTGFDCyZI+vM20OWSxE88dFbaWaWm55TD33TwrsQ3QRhAZDxJj3NacQRE21fSY/JwPAvkREOrTc4VAgCtTmy4cn0tw1beRX2XA39o X1dFWpPf FPPmBkqqbl4ZlfcpHJkBtv7OmnUQrFux+McAuocReCNhu1FVfTb95kbmzJJUWhP5xUJ6kVcQE1oGlWaVCGFNovjNjXH0de3EXMA5Z4Cw/+logFEFqH8G/qwjSsB0I1oQZ0zUTxGnxOUgyLPj5XE9XxQ2CGQK5YJE6GTIE+9smgWa98lE251jsODzJMI5Ltsg0mLdK5OtyNLIe44294x8QLlmSv8S69f07bFODOk002wdbigrR9dTxleYVp5vBG0I2zyQQc0s2KEtFepLk7Yh2pZ1BM/jJx5jVWl/038iDHGXkiNpebThOb8GxS+Fvh1TGyizG1AUKtSTIIFnxvtMNfO42V8cv5C6/bqJ1ibGh+L1Z7vY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000005, 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 47ccda207bf3..48639a48ddb8 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2022,7 +2022,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; @@ -2166,9 +2166,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);
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 <senozhatsky@chromium.org> --- drivers/block/zram/zram_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)