From patchwork Thu Feb 27 04:35:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13993747 Return-Path: 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 EBEA9C19F32 for ; Thu, 27 Feb 2025 04:38:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A80B280013; Wed, 26 Feb 2025 23:38:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 757AA280005; Wed, 26 Feb 2025 23:38:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A8B8280013; Wed, 26 Feb 2025 23:38:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 39EDB280005 for ; Wed, 26 Feb 2025 23:38:08 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E7B2F120287 for ; Thu, 27 Feb 2025 04:38:07 +0000 (UTC) X-FDA: 83164467414.05.3685FEF Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf03.hostedemail.com (Postfix) with ESMTP id 1133C2000C for ; Thu, 27 Feb 2025 04:38:05 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hhJMK461; spf=pass (imf03.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.52 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=1740631086; a=rsa-sha256; cv=none; b=hlO8ABVXOAOI9sEftIZEuSS6UpoCCPlw8k2gZBVCzr45qtOKfC70+NYFBTkIpQ3NLtc5U6 hcE8w+bZlb4UqlYwkumy1dyzeHyAesBATTTBqDOV2sZ3Wm6FtIsqcvpbMuds+R9IBk6wuR mFPOEeBwkpdT6VIWZJXFV7/4DOhhlig= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hhJMK461; spf=pass (imf03.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.52 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=1740631086; 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=5Z7L+E0AxAkJHYT9s94E/nR5ku/ie8tNmkgfIKxsvlQ=; b=iOZiw0y5983+FtOjjg9b4g2n80MQUm0j8u2p2Fq9FQzzLDRQtEmyThpVei8nXrkSNvxk4B a3Vi3mpvCU65C9BUvpC0UWR/DjijrqBluD/dKjUf2D69m0MPc3+DE28TSpVlzh2103KkQB Pk2U2dmWdUOnB+c+QRIdqFNyTIMDCck= Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fa8ada6662so1125413a91.1 for ; Wed, 26 Feb 2025 20:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631085; x=1741235885; 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=5Z7L+E0AxAkJHYT9s94E/nR5ku/ie8tNmkgfIKxsvlQ=; b=hhJMK461dn1uGgLdrzJUnqlCcdFlFQvvh/T1zsHdUdL+XQFndyvV7ZHBaO7oBzupH8 brrecAh5sTbJlKpvPFFpIG72l0DwGw9OC2BWM0OqUBHdmS94aPnAv0jyswxC2gVc5Cim RWu8Fj5HbaW/1PoxNt94nhnxYcwitL8Q1nCJA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631085; x=1741235885; 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=5Z7L+E0AxAkJHYT9s94E/nR5ku/ie8tNmkgfIKxsvlQ=; b=aji2qKsPYfwrCOfvleQKfxZzqKhi+Mr+dNYaHzpREdpJmgGEBbj7OQIwtJQ/8LvREO ePVvLL8n4VDt3fMy70nNV4VqKQ+U1i/k/hod7X7Cm94oh0d/92UlEvY/WSvQileDUnOv 9BokmeCgbH+cCQ5oFvzKNEVk3l22X80LYr0Ad1ecikvbgJw11K/nff+mCHMbTIYqhhro BLBGokYJgXf7ypsgSUS2oSy5UitpSBtrbMTfTa0Zd/Yl407DP8p1OBr8D2FYP56SJieQ 23VU8XOpRWadP2pSjRVg7cluLYDoFm0UscEr70i/4n1ch2dUbM+bDsRVzBMLp3LB+Jua yoCA== X-Forwarded-Encrypted: i=1; AJvYcCUjYXfyB74L5rtSuUvhHcnqZDp0LI7OAixW3H/btc929/6AM4QxinW6/W2CMDwutvb9smI4HXt8Ww==@kvack.org X-Gm-Message-State: AOJu0Yy7KEz2CWei4DlwZmSgIq/9Y2e5LllInMNFXEfQ8i7HH8dIGu9s fahEKKpcCbxlxb/iGifgGeEz5fdXOUTsy0QcNMvUGsraou1cTSPBNCXTbJxKqA== X-Gm-Gg: ASbGnctchwXuNTFniDrtoCMPBuxCBkfVAHJ/lftEnxAocAOMmpP6JwxIMheHXSXseEU TtJnqXqnsK66ro6Rx6EqVtwibqz6mh96i4f13k9YI7JRGXZLXc7k4PN9xjALgFRrQW0F7mvFFzx v29gUifRnh9reFmzZeCiNjWVuRYb92wJdXjiB31n7FiyLqygAACNwB7b7+s4bj0cXQg06quBwAr ukMf1jWBhGmCGS/i6D8WfLGJSFwGAhNa0eZRHtpAkonYbmsFh66KTZEgvh50F3mbM791KXi/EBD uel56FsIGF3529v4gkRUlrple10d X-Google-Smtp-Source: AGHT+IHkiQZTH+QyI09NsnNe2+VUmytHTF3AQc8esT3P6nxO5c5MPzYujs2/5+Dmg9L+ktNJZYSfyg== X-Received: by 2002:a17:90b:548f:b0:2ee:5958:828 with SMTP id 98e67ed59e1d1-2fce86adf6cmr41590472a91.9.1740631085050; Wed, 26 Feb 2025 20:38:05 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501d2901sm5005945ad.30.2025.02.26.20.38.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:38:04 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v9 17/19] zram: do not leak page on recompress_store error path Date: Thu, 27 Feb 2025 13:35:35 +0900 Message-ID: <20250227043618.88380-18-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250227043618.88380-1-senozhatsky@chromium.org> References: <20250227043618.88380-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Stat-Signature: zg4njcbepk1zi34s56desrqy6x5s7yw8 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1133C2000C X-Rspam-User: X-HE-Tag: 1740631085-309785 X-HE-Meta: U2FsdGVkX18dqYRss8tltNnOPt+29E4QRBW4L0orJ7pYggtRz7N1T3d2rESmvyuEzCZMl8Nr0IlEIruPLDVGj2f3nPOALiC2aCeG2pgEU/yssRut7nWzGL/qhOi73KMKF7FKBNE5bs7vUelW6s3peMv6fr2MwHTj2ROqpncyjGLTrGrx18HnXJKK32aW+Dj2xdT14HWhXDwo8nsXwbdaj+HEMknNsKF0g0+Kee5hppSTSC9qu2CxWGGrErO/M5eODR972/FGOWSjRLaqxYlUc0hUKQG0ThpA7wkdkavubyn1usVjyBv+2nBnfiQY9+nMwquORX/mo6u85r2nk2Gars1Zu5VM3y8YdN3ORRn3KwvFz/tKuB1FacvWumeMhDGra6BShfcmwPFfHpXB5/EsJzzEc/E7eAxPoumcRZmnclKsAnebNIqRU+Z7hFuTS+4TnMB460F3uJJ7RLPcYJAZZrNKz3SKlgbVyIPtOD71CnaPpbno0jVzuWp1DbnDFUEe/Q23veEX/5qWKqVocRFqPaWfG2fYGho8X984Y3PLzF+ob7tioYKrAhdkoyfmk7qVt6ss0B7eB99lLRCb9XPwLGYzJeUfmjMFvgomU+DQYcDn0Yv1ooKrd2QRHdmMmgi4V44nD6JnUZVNi+3sVSxhlmYH7IJlKKvBsqbzrQ2vBw/5hkzlQ2u2tUuwJTZNjKWiFsceHwctorWBWb/l1TqRphMbdWSgoZ+6KKSMZ/iIzE/II0yWsx8HEBy++s6wF2WveJvLLvousjqvGLrLHv1jZvrq+o2pFwgwRyO/nIdsNukloC/2msHFFjH4OBy70Ni8jwnyuwYrQtxqjlMJ/qn866Mz+L3WpyA1AW3Q3A8JMIeyTJCyxDUGUPH/G2H5sTjM2HrZurfeBjhza9rByizoIF8w7dh77lbnWEjhySqpro/u1N3Fx11xIZ32l3Lt62b7Fz7FMKAPjgUIW2YIGUs Z5i542Eh YQ0f/GAIs6ARBHv+FMKbovmS5r+91Allkaw6DxqHBPP7C5UKG+rZqD2gp6Rgx2bW4Izyg5uvLg7/V2eg2jL85g2SWUES/kYhqydyN463ZoNmwUVtIOznLlY5F/gf6hSEQHhZECGzm8jSqXoRkjU/eRZn1tqnRXDZshrZVlxWtKIV4Me3ilLQ8gE2P3uGFxcdUZm913vrWs1zgW3E4JZhYwg8WLascQ7ZiVnUnTgarAdGNw/1PsQUslalWGBur6S0Z3Dlp12o7k76uOkPOsSUG7FgTx37qhacpgNRTLp2j6Rh+ckqTyLEtztDQ4sSauXpDwYcC3vVCE9qPtEa2Gb1XD5o37EJAC4G0cPFinCzfiWCpLwQ= 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: List-Subscribe: List-Unsubscribe: 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 --- drivers/block/zram/zram_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 1e2ba3590a39..e8375fcdb36e 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);