Message ID | 20250303022425.285971-19-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 DFCC9C19F32 for <linux-mm@archiver.kernel.org>; Mon, 3 Mar 2025 02:26:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73ABC280015; Sun, 2 Mar 2025 21:26:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C380280011; Sun, 2 Mar 2025 21:26:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5178D280015; Sun, 2 Mar 2025 21:26:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 2BC79280011 for <linux-mm@kvack.org>; Sun, 2 Mar 2025 21:26:05 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E0B7E1207A5 for <linux-mm@kvack.org>; Mon, 3 Mar 2025 02:26:04 +0000 (UTC) X-FDA: 83178649848.01.8BBBC81 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf28.hostedemail.com (Postfix) with ESMTP id 0DA8BC0009 for <linux-mm@kvack.org>; Mon, 3 Mar 2025 02:26:02 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Mk9jRG33; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.46 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740968763; a=rsa-sha256; cv=none; b=YadOwU0DQ4AOwyQzOSMfYSNKVpRl8GhW+DdYB9RAb9Vi1YArfKE5OWZ6DvHiTeohVeM+Th WBfwMmypt6V9sBM+MZ5Z8LHUj/ofJlQn2+aivwR34Q3c7p6sdY9LFXKJDHzMKPkdRgD8vt hpJbQIOiuEet8q2oesvwhcRdLEk7UZQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Mk9jRG33; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.46 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740968763; 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=7MsZXmzA7gZttOoABIScoWzRHdPrz6HqbSztfy5OTfM=; b=4MM6X0vyvEHrkT2ypqDPhCxfbjPjWGfQPB2XkSGeCHFPF5//EXNLWFaZk7g32pWLXRbVZy lc9xq2T2bF5NUOajHY+gMYt9wUw93IwIEN/0sYBb2G+4AqTdmMT+1lJjJhRQtiAu/OZtQg sIZSDDoDqCj4nSMQ53FgrN65dAsyObQ= Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2feaca4e99cso5323977a91.0 for <linux-mm@kvack.org>; Sun, 02 Mar 2025 18:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740968762; x=1741573562; 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=7MsZXmzA7gZttOoABIScoWzRHdPrz6HqbSztfy5OTfM=; b=Mk9jRG33OiwbDtEWFj7NtdE4rIvGQHEXlJq69VdyIb7h2cSr1vkQ6o6u4POTk+oIQl Rp9nk97l4eW0nwWCAR+0Z7XwQUKbznEiSYq95KPTFSUO1/6/nGF/nZdWdM17/Go4bDI+ gCaWYxgZXAImSYWgo5ezSbp9ThkkyMFRDB4CE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740968762; x=1741573562; 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=7MsZXmzA7gZttOoABIScoWzRHdPrz6HqbSztfy5OTfM=; b=wd4pZFbHZzDyrtOhFX16z4TuPmhfOViRABUqdvHztrsLbrfabI8l8Sc7IezEl6/70r wQbZfHZgSMAutTaeiVE/6x2C6FEWaoRuNLbTquj0H/ynOwlHxg0xfMXQMpwCYNRsytuz fck2Wt54apiMK02nSn92+/hlt5vjbdAft9pmJxCKkzmIWomjElmVXJeiV35A9ap4c/ah 1ULEc4yZ1YqRGaLEOeSzKl5NxSytBD1KgFrxUFCwdtnEKgUNdQ7g4s3C0qD7mvabJ37d +J0idFPxzYA/D3XIbMpgosqoXfL69oD2KntvjctaQsHN54QCUC3TnwpuX7iWwYTyhxUV gUsw== X-Forwarded-Encrypted: i=1; AJvYcCVtcu90pf+U6ZHs637anosf7APCR9tG57cqvZ+dHzT9M0YuWe9W7woeo6to1uW6wSB5DNPdpNEjiQ==@kvack.org X-Gm-Message-State: AOJu0YynGwRkvJClVPT3+q3BVLSgX1QFyxIWdPW5M2zvyZytdg5YAfQO OotPeP6fGDAxVgElNUfTXFR9kfG5CHRJwgeNEJVKgfdkUCv2WX6pHDIQEahz4A== X-Gm-Gg: ASbGnctJE9iX3QFAKHSiwp0rCtH4KlkFfRgnsvHx/wEGKeYJSPgJh/eEl5bC89OxFlk hMxKsIoR9sogYXSCjwoQLx6IxnWdl+x+WOstCQxQ5pF6eBVdSZASQZDoAFv7cbj1PEfnqPjW+Mb 1LtoL33v512Cq+6662qQsDCOHLPrbxzeLBKfHj/xHG9uphzWR5p6E1j52cNQ7TePeWfHOeVwsR9 g4l8gxrN/aeYBFYH7MBu5i/cy4GsPxOSgW0VrxhtDWyWYdylaZ+NaxcYnsjodU5evb9oFX+yAkN w7II7f6Z3jxQcdcCCGrT0LMNaIz9KcBgvxttfLU4uy20rb0= X-Google-Smtp-Source: AGHT+IEwLUQ8+oZJN0pj6P2S75Tk9SYQBRSYoeVDDP2x+EgMUD0KKR9qXN1nP4rIBG836Z6i3jCjHQ== X-Received: by 2002:a17:90b:1ccd:b0:2ee:c918:cd60 with SMTP id 98e67ed59e1d1-2febab78da2mr17797763a91.20.1740968761993; Sun, 02 Mar 2025 18:26:01 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:1513:4f61:a4d3:b418]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fea699090dsm7711363a91.48.2025.03.02.18.25.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 Mar 2025 18:26:01 -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 v10 18/19] zram: do not leak page on writeback_store error path Date: Mon, 3 Mar 2025 11:03:27 +0900 Message-ID: <20250303022425.285971-19-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog In-Reply-To: <20250303022425.285971-1-senozhatsky@chromium.org> References: <20250303022425.285971-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0DA8BC0009 X-Stat-Signature: hrjaruto8pg5p7nz9mkjibj3i7dr9fqn X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1740968762-651181 X-HE-Meta: U2FsdGVkX1/Rxfu3ztNlgsTm6Sc1IneY3E//CZDPGEuEVX8pnU++OtK56CROHizbCfXDXgP/Jbn+oNnvZ3xwd6hTrngcyt3uDZH4O5xJ7Hk5SeekV+hFsES+tbUzKjaHzWEjDGGosrLRZgBQ7aaOq/mvsL7BFHVL5l+M+1fxYqJOTe1w3zHZzu1vkY0keogAUpjiVIcL9WAY1NtS3wjXqBgN9vsT+lI2fzLwONEgE9a57MyKy0NJfYLB4hnJAPl+pILD778bYDT7zPS1dpcwxdpPeUTE+1YmdsPGSRM/kQhzR3URQAkj4bbqW++rir6tl0VS3ng09Ur8ovW0pyn0gp3fvP5Jx/alOzSOvydk5eWxfVy40XlKP0UdVFqR/7IzFrCtxcKp7yW3UAmGgVha72Tk/knX1aml7a4wiLdcpyFIUPw+mGy/n7D/Kc1pwcy8t8LX8DfzlRTQF76YgEn8kBL+pRrjOfnM+UnB2LLTXRqWOJZXVlSSN2hPPXsb54rveIUnzsNgJSEtyuGxNepxS8RVB+e1Q2Qguu+e22BB23VmiXJ33WiAy5IDKsR5wDR8sKcwG9+jz1aQtkQ1G8t3ZJoxf1qGFcUEWwCJbS8Q4/2RCBA3C56AfxoQ98dZtftfOLAn9ftxzsTOD2j5VqC8hy1aADXunBRlNe0rsACjYiuuxyIUoFMn8ksHEzwBnN3zZl6qOOeTl58xBCVkjrvdg8lDGCB60l6Q5ap8GfIoRIUYaXr3nPAwhI2JQAFsF+5GmLANqqEWTDPif7f9huWt47UASYN/RJlCgGIS6eKSesxUk8kh5MiINrceQQBDgqXonSjdZfXGWYS0h2yjaBASOgh5fUmMEUoCYBqYg70QuK2y9x9Kmv6Q65hF2pw/mvy1IO08zwvyX1tx28vZApK/9AbiArUNF/qu4KdaqVhOz5H0kA2eSDfod9aJwatYaxnkWWSxoDfy48ys5Z/suLJ bZ+8u2hu vTVZo6B1L2PJJ2EAWLO3MkGkFowMKPaB1ZBGHsl5rydKxCIgUrGXyJsfkwPy+9tJpqK7rcBYUiisjS6f3sh12ZEim5gauS35DpP4XXthbec30/iIJ2EKufKzZcJiGDGlfUWpolXxVQ1PkkDeExq7mJ60PMVA52aE0lifJuNDPGRZeBYJo5xvHu71XRQbZaPwvlu+GKRTq89SmoFg53UG7AxiK63jDTh53bJSmQ0sRUrGrVmne9UWIhrhFOni8fpO3ykaOo2RuA8Xx4lSMRPcNjoHWuYmBSY8QgcpsjCjpzA/kIwfdl3Od7exRGELJQUUtUYdf3cGVrphSI4R28NtXRz3iprqkJzgIge0YqckrqscmoA4= 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 e50a5a216974..fda7d8624889 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -787,7 +787,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; @@ -929,8 +929,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(-)