Message ID | 20250221222958.2225035-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 1B511C021B3 for <linux-mm@archiver.kernel.org>; Fri, 21 Feb 2025 22:31:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A938C280010; Fri, 21 Feb 2025 17:31:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A43C728000F; Fri, 21 Feb 2025 17:31:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E3CE280010; Fri, 21 Feb 2025 17:31:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6F43128000F for <linux-mm@kvack.org>; Fri, 21 Feb 2025 17:31:36 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 22781160857 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 22:31:36 +0000 (UTC) X-FDA: 83145399792.29.242D28A Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf23.hostedemail.com (Postfix) with ESMTP id 3D1A1140019 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 22:31:34 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=ZLpeO0mu; spf=pass (imf23.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=1740177094; 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=bqs0vWPwH5ieqcucXqEdSYkl3M4q+06+7pDXyJI2dK4=; b=OU7VATt0YeMkOawnOaVxma49JPLz2oshQNvKub+SP8f7u5vJKs1xSdE1vDg9+x+jqaDQOA ytfmwfT2dpteLe5iMcKvevbV8iyvdcxNPEuOrdw4pUDFrw6mlxCBSktkBF0MPgn0dOtBfo C1jlUhS2mEfGGyKMvk3hyl+cJT8OE+Q= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=ZLpeO0mu; spf=pass (imf23.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=1740177094; a=rsa-sha256; cv=none; b=5/LEwSgdlkq4Cq00k8KUuVyjTjnzHoXn/lTXyOrE30ujoUkFbmXIHtdtNVz8/WtZ43neju oYA4KTjw5xb0hT78TJkKAWM51O02JyhbhT650BDu3LdUwCdmzbHZJIMyUC3fhvMkoVZl6M NG+xgQ/M9yByo4BZjm+FfqRpjuH3/3M= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22104c4de96so47052555ad.3 for <linux-mm@kvack.org>; Fri, 21 Feb 2025 14:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740177093; x=1740781893; 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=bqs0vWPwH5ieqcucXqEdSYkl3M4q+06+7pDXyJI2dK4=; b=ZLpeO0mudrLqt4qXHZKA0eytvRSO6bZVLjw6BGhHg7kviePsqJElrgpuKX/1lWfXri naeOnTRrQrHvJ+RVWz1CRuq0dlOPJMi+f0qwIzW/UUkLuiNH0KNmamNxucx50XEqTNa+ CA1zZ2iTRL81rz+1p4Q1uhQRJOfHvpI6wfP4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740177093; x=1740781893; 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=bqs0vWPwH5ieqcucXqEdSYkl3M4q+06+7pDXyJI2dK4=; b=F+jVh2pLEsC3aMCc4nvcTl6GzuvuROTy1+J/n5fvi4ObcNvWdtTkxa0u6j2rQiNwBZ YKR8oPHTrpWiSYlyeyLb33YDmyIGsF5bweJ2KDQcmHcaAj1Br9sgZGXM8sxs9MrCUhsG qKiTc0QuhbO2WMpBLnuwB9PXEVpcbDHyV1oG8cQ3yJFEyEvVRnWFHVskjb9rsDm4Xlym q4Yv223eQmT46ASeOLLaDB6ZGcP9OcgK0H3cG5NmAKqPOdVwqFXJENAjObmmnPFG8alO bW2B3RW7GNSzZhAaNEg3g5awA88yyS9NVOHuIsEDRPj86FbfCDaYzuv/n4lntB6AzPxV wMkg== X-Forwarded-Encrypted: i=1; AJvYcCUsyDNoZgQO82yJaD/MypV9Es6REriZHooUYoe2tS9nMFrgBYdtJjmj0ZlBdbSFXjKWFF6O5ftsSw==@kvack.org X-Gm-Message-State: AOJu0YwltpKwqAFrqo0X7dPTyBH1C2KmN2X2NQQvaaHPbcgNfdNLU8Bg zCj4lzeVoRZUqjQATpqUGgnkmY69UgoAnAAFn72yfbFa3dcowyCY9fuKCIfJkg== X-Gm-Gg: ASbGncvOjX++t5c3rTqPP51M3hg6LF4BPGmNkqKpp0RwgoOdKK0K6VFrssCC75poBmd nS7dD+hy9DGwVdoH3tB6l6jULm14dautg01zABx7nWRAnrzrU2NBu5daPWktiyh/9t+kJFMzIKC HU3ehX8GHf/Ef9kJuhgLZhxwfR6sdCOBwqHSy6irqzSAu/qClGT7kKeUzR5h7ObXrGMEcrI/8oD x/gJWJ/+y5FhKh66vBTcuWQrLkgXR08pPBpceglKOWEa7ZLPbhS3EnmTqyrlj2MmPAKbB2i6m4G BWW2mnqKfBTqbZI+3XNOxhBvff0= X-Google-Smtp-Source: AGHT+IEILYc33c4jVA0dGK0BjQpLec5ckC66yqnrCIt209YHXfUD6zSxKU4JtkKRoduvqU5N8dK06Q== X-Received: by 2002:a05:6a20:12c6:b0:1ee:e7d0:5c54 with SMTP id adf61e73a8af0-1eef3dd815dmr9388338637.37.1740177093080; Fri, 21 Feb 2025 14:31:33 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-7325f063782sm13714610b3a.148.2025.02.21.14.31.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 14:31:32 -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 15/17] zram: do not leak page on recompress_store error path Date: Sat, 22 Feb 2025 07:25:46 +0900 Message-ID: <20250221222958.2225035-16-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: rspam08 X-Rspamd-Queue-Id: 3D1A1140019 X-Stat-Signature: 8opjt8x868rihsama6nhyp7c5apbishg X-HE-Tag: 1740177094-27697 X-HE-Meta: U2FsdGVkX18MCMcd1mdugAD4cvhK0sFQLRD4bUfgDJnMCxRKY7YcpmlU997RRV1Py2nZ11x4UMqeMQ0w/KlOZZeGfH+fI7p/CLs+BlUpEhFq+vcTeOfYCGYbgHTM5s+7qAmYym207804F9lGUkU1L31H/yGnBRvDiy1pesUAxTVtzGIcNdqe4ekFCkko2t4rZUEz3kTIi8EA2VohhYZ5R8PjTTqIAYdeuiMTkRwR2BwTRasdT9/o7Ql4fBmeWSupaF8IK7gOQUjysdt4jDTWUTvH1hdKM90UHcz4DOZZwj06Pv/lQoY0gSH16Ub0v6TyeS3yE+sxoRIReemhylSKTFLt6631pI8HDD+HiX1EOPgN3sQB14PGtJitARuUsJPWGQlbSTD7VW4zr67iuq7DXBWZx4ERttSNc3ni3LRprrqkA1W9SJAKLBm9tbRIMOau+Eb/MA6fsX9BGzjtFOSr3vdF1yimRmx8ushNmwDdmDxy86e1VAKCV8cwWqRRamceVlo878sBD9vwmSSgW6G3BUi/npINLgKeRO+iJUrePTR4/LtW1EW4LRqwtsf7xA+S31FoxSBEBtx5jqFwLARh+QemDKKtfpwkHDaZNq2qEgr0fXt4wCzm48aaZjYi/2y/Ldc/a1K+9jB5ki1hRe1TLvoJMBLT7mxEsaxLYz74i/19BeMt99RF9EIwXwQ6pZyGB9vM9yTFcOKQtZkjzml9Sn6EzVZOgRZQpJYoDqwstBtkMlVvzQ905miYmUL8sM2O/0qhBRPbrsTztJLdY2y3PxptDDVt6c9SA4YtVb5q74QFhWvfjRoTwqeWRE1FqsXkeuq49kWAoxvBhF1cyuScuVDwhV9s6xCfxEgvLM2vcEQLuDLRoaODko4x2/WxA46WCQNcow9BHhkAASFm55qUS5dhgke/de2MuLA6FsE0ysPE4BO5NS0qVHNjd53LQ62VPtnvs83UX0n/BtS2lHm dL3xFQ+Q rbDLMGiGi0sUn/93cHZIP6tWQw50I7RUGSVbOVZ5ARpzNIs9mz9SF0BfxKvvsSSnYs0vYR0RQDLOre6dCnM6yigpICfPjmjKY6R0MRmmfWxYnfLexM97+tsWh/UFs/8ubJV/2B3F1E5yWyFpb3/uZ1pne5hknRvEZ9TzeSC/T2s63n6s4i/DPUEhR1sazvjmkfEl3HGhKFAEFkVLW022evV9vlvT7PmWt3vtqlymLekgd0UHLj7rpHEwCMoYY2/CdYrQUkhaLCFNdg/w79Gr+1+UrP1uck5Fwj02mypJwVO321XVwj6wZlff0iiZs28OEh8KaVvSWnse4WDbTCnBPu05iHhMdjNkEprL1EwGgU1zmAVI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000146, 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 1ce981ce6f48..1da329cae8ce 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(-)