Message ID | 20250303022425.285971-18-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 75857C282C6 for <linux-mm@archiver.kernel.org>; Mon, 3 Mar 2025 02:26:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00F54280014; Sun, 2 Mar 2025 21:26:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EDAB9280011; Sun, 2 Mar 2025 21:26:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5315280014; Sun, 2 Mar 2025 21:26:00 -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 B1C68280011 for <linux-mm@kvack.org>; Sun, 2 Mar 2025 21:26:00 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6BAC11409E8 for <linux-mm@kvack.org>; Mon, 3 Mar 2025 02:26:00 +0000 (UTC) X-FDA: 83178649680.12.E9BDD06 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf24.hostedemail.com (Postfix) with ESMTP id 8E38C18000D for <linux-mm@kvack.org>; Mon, 3 Mar 2025 02:25:58 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=IreV1wlZ; spf=pass (imf24.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.47 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=1740968758; 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=iyo5ByX4ms7OSRp4VomEFa7attH8xkBy9eJ/3JfBMpA=; b=CfXx5WW9+Szv3AYxbvtBxiuJPncBdTZN5zpaz72YtOWvzY7YVdEBSypCKWdmqAiT7+KLqO 0boGud+y7Ww3Hc+3s7FKxnv5bu5mCbTABqZe22YuIKRpfbzJKouh66xGmKaOzbyyGcXZIC RvcuUhdrvaxKdZuvgi30LX+Z2x8QBzM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=IreV1wlZ; spf=pass (imf24.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.47 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=1740968758; a=rsa-sha256; cv=none; b=goFqxIA97ufzjl2aEFNMYjVV5MgGSY+m8zZDbQ1aUgW7qQrMhuKRWcVkFgFL7PQIseXx1B e5BKDVzziE8MctlUG/KgvrEuLX0rbTjnH7FqZJEUPOZcP2kWqxeBGXmFsscRU/k0GlnfEw LkXaW5Aa/DSEWlQ++XPZStLeWGABI8I= Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fea47bcb51so7779494a91.2 for <linux-mm@kvack.org>; Sun, 02 Mar 2025 18:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740968757; x=1741573557; 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=iyo5ByX4ms7OSRp4VomEFa7attH8xkBy9eJ/3JfBMpA=; b=IreV1wlZo14eZOrAQnN/vKkC4vIMfEc5Y20voe9J6r/3nwrmN9vVhqTK6wq4Qse73h UZqGknO2obvP5Jzx/68nRxhBDAbXqfYkyS+8DpBFaJ25xiH0HycIhXbfOEUTpS0FhK6h GqWrIY1Q7wlKCJf2ZY4tcTokjcYiNp5GBdGX8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740968757; x=1741573557; 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=iyo5ByX4ms7OSRp4VomEFa7attH8xkBy9eJ/3JfBMpA=; b=DwtizE77ebqFl3sTxLJ75O9mGA6NUEqpz6+4NRaF9fAKlN2BkGMblxPeImANlesSIF HT0Se3G0KSyS6YvfCAK2dBdoii8WYTt5H8GVruxklWAy7u3Cte2Cv7Aa+ow2t/5dkvFn qfgfV9YGAnvb9b0Rh3xyCOjZoZOGlGTyAGiH/WjHVF8g/oIFkcjxyoG305MXSrpfAjfE 2It9FoEjx3rIiVppxY710svWw0vIwTbEa6FR5Oaa9IPr687g7+DRivRTxYwkBK8N8imr KnoXe8ZoYFsvOm52/1yyZB/zbdwIWb7azfj4+40kCYP16KUvfQIeHk/oPLLXjce0KFv2 rLvw== X-Forwarded-Encrypted: i=1; AJvYcCXSm/+mdy7lWWXh6hUnuU2/ZwUuhDmOQQemg8Dpofy9SSCiuSi3zdLVCz602xatlvxiJjKIF9Lxmw==@kvack.org X-Gm-Message-State: AOJu0YwW//T3ThDTj/7yIddzhUxKh3Jm8UYR5GelbugALI4gwWURYNsj 2pBY17NiosZmvknkxiTe/iPQhBepxK6uEvnJ189ChbrX3NHjN533/iAdhlfjvw== X-Gm-Gg: ASbGncsdkNif0Q6lGnChs21FpUqJmgDwDDM03xvq2p8uTdCkTn98hRP0kP3K7zuzjet iFX85ExLX0QDgfcLOrQI4r7OOrA6Mgxuvc2gPwF5qqBz1rgpfPmtiMGaf2brHw+Cv/vQ+AMP/su xRa72T5LH8nO9kY+VGsfKfBfKPJoGhWO3aLxkEgwWeovbJsq9gMPH3fPsfks0pmOC14jMU7MMb3 qYrfttCSs1CkqShAhKeRGOhJYpeZVg6zWUanVTIt+e/heIatPUPOIOeVkH70RwPi9dEMCiOlyW3 PeLc5ye49clpD/h3SnbIdtPpfr4v+NF0wlV3HvgrjXqkAd4= X-Google-Smtp-Source: AGHT+IFJotMZFWyExSutVlC701wQGCarIM/cdTnnq47i9KiZ5lx5Nlm+Rg/03s7HRjl5+WkOajCTxg== X-Received: by 2002:a17:90b:288e:b0:2fc:c262:ef4b with SMTP id 98e67ed59e1d1-2febab787f0mr20378028a91.18.1740968757557; Sun, 02 Mar 2025 18:25:57 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:1513:4f61:a4d3:b418]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fea698f3b2sm7671186a91.41.2025.03.02.18.25.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 Mar 2025 18:25:57 -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 17/19] zram: do not leak page on recompress_store error path Date: Mon, 3 Mar 2025 11:03:26 +0900 Message-ID: <20250303022425.285971-18-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-Rspam-User: X-Rspamd-Queue-Id: 8E38C18000D X-Rspamd-Server: rspam09 X-Stat-Signature: bepogyn9sjbuisuopqha9rq5ys8zr8ow X-HE-Tag: 1740968758-608420 X-HE-Meta: U2FsdGVkX18NmDlVkBXmE3J5YTeuzQ5tSpdkzp4DmDE1pgaDju/xA9AuQDFZzZM+xklLpRV4Wl6HN6vXY13cvsesSCDCudMqlHgR9MyXWxyFM5533QUG9WrxalvoKDkYirguRtlPm4v7RLGg7rZhqzIE0hW42L4dimcFl/zj81b2zvpZilZI4BVSg3UuBk8qHHeWvX02p4EkRaPz3TCUBGbZt/wvPvp7rYFhewip8M+lpduf+rA3Q2bV0/HQok+NnNux+ICkghhPuoUBqgSjU91qQOvMjIJZcf9vLYo5RZ2FU4sY+mv1eD8O9+rn5k+fg+1BkveUeYHSGgwp+ektxogdkADjgiIY+Y9hcyIYHNE+Z3OiWxLCJAMDOE5aiBdJY1qOtHw5h37Hd+FrE4MlqZc4o9V2DTc6Uc9TPBJzCotOJHMdrfulSh+gaVZAzTPFL/9OXlPeaQVomSY9aOPxtjIFyLL03dB2tuiK+e2x51SKfkOsKJCF968vZGW4sh4Pe6J18y+KcgdYz0VaSFDxlBkwT7EcWrJGi15QRIktyJJ2gxdjetfpP6zE53tNa/JZkBQBZpVCJiGO/Bx2T/WO83EM465k3seWb9YccLxTo23xbk4Akn53AJygOEimA0mtqQrpVg1ntGlca0KQ8NwcGxNnZ1cGgiTMW5PyRgipNofe7VMJvL/2H4Ck9q4DL63H+lb4nYnDrfZb6bM87gFwALr1oR64YwSjfJuT0I8zFLWedWvgADJy4Evx5XJa2n47HK9YZ8IXDA89Juvq1Dul2ZAhscjMwpYAGbYZ++xnUgsw7s6cpEHOOTypkpkI8MYGvGmZZb6n54zDrFvhqzHfwUMXZIisbyWl+71MqQYahn2PwyAQ4BiEciSVwRhL/K8jaKd6O19UdT5LiG14sVOLHfN0RuojOh1gW8OntPfDqBR5ZQ/sIW7B54pmniOc0vUDV8pmOC6PcdgrzzqrmSR B3D/o1ZK 3ljOJIh1bnJfTfPVN3RlRxBCfPjNXTuCgWb1tHaLgjNZEHwRRAyEIdNsnIIl6anc/kwH/xpHAhGCNZtxeEQN9PGcb4cQ6GvqDFcRmvteeVkqkTzH9oq8JXHVyBW0dXpqpJbmn6GAOCviC1YGIi5+9BCjpyjUliT9jRrSruni2HAzNRyC4W54eXfM5XESuUyvBrqP0FyZ8sdZscteZan9X//OETjNhQVjPu52lAdP8ZxoXNmoUHT2NNa7IF9gllXrBROUyxApXerOFvSrvdoXB6l3XbnclYWZZ6lUPd5ah8K5zQM7KhEUZa3YgMIkXHJwLo/I8hTBkL9M9+Jp80oSx0t4sNsWLHb+jCLn8MmQ3joXWvQ0= 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 62aef12417a4..e50a5a216974 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2013,7 +2013,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; @@ -2157,9 +2157,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(-)