Message ID | 20250214045208.1388854-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 EAEA1C021A4 for <linux-mm@archiver.kernel.org>; Fri, 14 Feb 2025 04:53:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7FE41280002; Thu, 13 Feb 2025 23:53:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 784B6280001; Thu, 13 Feb 2025 23:53:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AF91280002; Thu, 13 Feb 2025 23:53:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 366A2280001 for <linux-mm@kvack.org>; Thu, 13 Feb 2025 23:53:55 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E8D10B150E for <linux-mm@kvack.org>; Fri, 14 Feb 2025 04:53:54 +0000 (UTC) X-FDA: 83117332788.25.40D2003 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 02BADC000F for <linux-mm@kvack.org>; Fri, 14 Feb 2025 04:53:52 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=eaDbH0j7; spf=pass (imf10.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 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=1739508833; 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=dOTlfVzF3e2Wm9f7wmP5BEorbNSbvme8XOlj2WM+zhc=; b=Rl8Cg6fTt7feonSy1guvnnDVXxDYGz/GvX1l5uj5BalTlPRfnCWeyG3OBEav37g3N75sKd 719NVJCwgA96kGBORIhtwZuB2qdHpD5VtnvZ1TBI7JMOWonDUwd/pgcVbTwj5c2QAmG2I2 E0mOrRxAXiD8i5m+vU+r3MjApmzKgSg= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=eaDbH0j7; spf=pass (imf10.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 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=1739508833; a=rsa-sha256; cv=none; b=sdqOKuJajuasi4TByRK2x7DmFLtqhoI9H9IN9q5Syk91q0SwfzWi3dieP818DddzKPMFE3 QMknLCedNrOWtx40Hp6Zz3O/oFjtOT+WIW/vOgNdrzRFoP9HtmVUFeDYWIBJnpAFDB1S4R e2q00PGdGnC8eNMWSDHHK1lxWGutzE0= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-220d28c215eso22108585ad.1 for <linux-mm@kvack.org>; Thu, 13 Feb 2025 20:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739508832; x=1740113632; 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=dOTlfVzF3e2Wm9f7wmP5BEorbNSbvme8XOlj2WM+zhc=; b=eaDbH0j7eUlv9WQNLDtE06NJE0mzHb6PDp2QUZ7V5Ie0c4uwa2lQU9HyLmViTLfvTJ jbLCC0t87yWe78RRnIPSpNf//blGThlVbwsWd3/ael0ggSguLUqXp/L2BcBchlkn9vTU aW5wiksHu9kB+IJnDfPAzseFqj8T3sjkWFE8k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739508832; x=1740113632; 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=dOTlfVzF3e2Wm9f7wmP5BEorbNSbvme8XOlj2WM+zhc=; b=F5Z1W5Uk1qeSlGohV/YzU/kdCtW51ErioqKqH6rEW+qV6t11DfmTkyv+fy8DnyC6lM vkpJjxWby43kzt7fRLmZF5ZYkrd5okr9+q5ER91SlCjWxX7xzYpQ9bJdvM0pW2MCDtgl F3QXkbHw+l9MUDc6s2HW23CZFQJiYtP6ZA1gJ6aLonxz3OyS+PRxto43dLO9qU//f8YA m1QIGF3kupEVuwmWzxTFcbG/WPjalG3ubQqH+NFezOfxagNz7BfftEQ/G9Xl/cU3EXiu xhn5ZV2i69OGWtgGrlmrOFJ4x4AUtpsP1iffCGS+9RqylqaTpSIHk9ycbuRAijNOtgiG T7uw== X-Forwarded-Encrypted: i=1; AJvYcCXA/RDTOvX0EZe5lyv7mJSmBsmlt7qzLx+w4iV7Vgy84vWh8Vhg9+9s6oD+VfgriGsmj8ECJ9UxRQ==@kvack.org X-Gm-Message-State: AOJu0YzhWxDevn8KcAwcrve2bq38JgMBtLUxjXW7twbi2QTHWK8d2Sr5 Ag+FsATHn/2OXa1MJcLrWIMPMqWk8Q3l78P8cqEpH/E9Izl1HBw1pSQEsG7VFw== X-Gm-Gg: ASbGncsFaE/0wklXaKiM4fVnpTSjoeinOyHlZ8ZF+4yo67Hr1hhDQPbpjvPWrK+QskB cUrFGiydPS7hlb7zYr/bPYZlquWJrIxHnMt1B5P42FBwkc+zVPePep4VXIOkeKfGAeNDysN7hQs wli4kIEKGowHCbvijlnFTLsYqMfzoZ5Gh85LiyHGVCtDdBiuPtVfrG9zsueaBJqasD4TbLATgby C+2fQCX2Lv6e/21avcxyN5qcmA72P71M3vCdfxvL5Qpw0/LiyscOxCzSuGIN3S40I1/N/QjV8pp HeM1Bzue4ul6EySC8w== X-Google-Smtp-Source: AGHT+IHKsmcyZIg17GYlLEbKgjy5fMkUQ7BmQ1HUJMxSkfACov/TMDteDP157pPV1tX1h7GlE/qMmQ== X-Received: by 2002:a17:902:d48b:b0:215:9bc2:42ec with SMTP id d9443c01a7336-220d216ce9fmr80849875ad.47.1739508832004; Thu, 13 Feb 2025 20:53:52 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:942d:9291:22aa:8126]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d5585fbfsm20932385ad.226.2025.02.13.20.53.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2025 20:53:51 -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>, Minchan Kim <minchan@kernel.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <senozhatsky@chromium.org> Subject: [PATCH v6 15/17] zram: do not leak page on recompress_store error path Date: Fri, 14 Feb 2025 13:50:27 +0900 Message-ID: <20250214045208.1388854-16-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250214045208.1388854-1-senozhatsky@chromium.org> References: <20250214045208.1388854-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: g8yft9k8x4j945axned68t161x1zxehq X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 02BADC000F X-HE-Tag: 1739508832-458603 X-HE-Meta: U2FsdGVkX18bdEd7ju30JEcQnGwPOL5dgZ1QfTKbKXzUA3bbKEl/TfmVZWIVBWr3yUpQ7FRzDVOk4QMyfgG5DgJ4f3PltwrIQZ57R6leyAgfaxeY6J43FfMLB3ZXEc6z2WHqo67megxq2VouI6Z3uNmecbw538bEp5LQGJdZSc/yL1f0DMkamdG3vYtzKzGs0yWIs9ihdVQw/uGFKt1dXGJt2Cvg73qIdombjXHWPmogXwbqzJDGO8oKD+RVDgaOJctgYDNNhauCfhJtYAZM616lHYz78nHBhA1qG1YdNxpWy9u3SG9qrFEPJRp+69pCecYTV5kHuMoQfWcIN0zRSuh/VxwkIz72vfrds/xCRhkExoAxR68yggwTZ4bOyqkTj9FVx+vJO+vDCL0cx0h9aY3IC3NKYzcijLACaZBGVGdH/EUlFFWy46+JRbPQo60Y85RZRLYkokeOu9cv5VKP2bUM6wD3KiMyPb+/OnLIgGgIS64sR2mQpZsu4JaatVxEKGbwDTlxu3prlehXT2rhO/OWPV/gi6v/iwPAEq1NEcOMYDGFwy/lx1WQc1sycmf0oRjwCjQVzNNt2bES3yEUZPLba6ZQQ4fKD2PSKgeM0C0ZT14kKZJYCR2Jyt+/1GGKHFqEz2R8LIML64Y8cs87lNwcFqWYI8xKUrf7ReTQOZBH6k/Je9aXMgUGlrgcj/8DkHaew5jisex8kafhk4uaNEiMiGJDM600tjW/aLkReHKY/jKqqoKUBuxyEmfZHNHSYy2mZ6GRifOS/ArrtCRzuRDUEoLmcvWRhMqCQ7n9tLTZYAXVtozoEjbulCQzB+1nTuQcUg5faym2frYHfUJFAJeaS+HuWUXG1XJRbfMMLI8dcXNrSkpCnD1plwrMcgvxzY53PpM0X/iWPr6dL4LH9PWa/nHcAxMm6ubWsPFwYFuVgP50ksR6kKusJh7CJNahep9Vf+NPqmX2XRzJT8O FoHVQsNN 2qpnQohMzQiBvHFwJTD7Hoz8EJ8828PVuZB5U/4nnOc3A/1HyI0BZ0KtQ1mUZG60OyKigW27CCjZl3uc0a5SlxlwbuHg1z0rdGBt1Zu+1BgQuyytEQlPomXxl0zaYMSKFT7DYzQOX5psj9p1N5NUVTTRL3uOX7IbmMEz7qZ1BAzMdk5jJFo8InXDIp5yvXw4i7yeA/4BSLuESAJeJreiJeUeooc5+qUgkPbB21kPm0aIr97wXVO6D43wZQkNZYpvV/GKbE4Q1ybzUY21a0GB5DAqJ+HsmoNcy56JTUOV8oUqgRCMnHPzbtNz1a28gNQ2glIkmCNBu4WP72+TIJsl/TDQ2owzBAzV7UtNq2DyrelkIYUI= 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 87ce304a60aa..b4661de6bc29 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2059,7 +2059,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; @@ -2203,9 +2203,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(-)