From patchwork Wed Aug 24 11:00:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rolf Eike Beer X-Patchwork-Id: 12953277 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 0ED34C00140 for ; Wed, 24 Aug 2022 11:00:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C0DC6B0073; Wed, 24 Aug 2022 07:00:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76FE1940008; Wed, 24 Aug 2022 07:00:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65FD7940007; Wed, 24 Aug 2022 07:00:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 56FF26B0073 for ; Wed, 24 Aug 2022 07:00:15 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 31EAB40351 for ; Wed, 24 Aug 2022 11:00:15 +0000 (UTC) X-FDA: 79834191990.21.ECF4025 Received: from mx1.emlix.com (mx1.emlix.com [136.243.223.33]) by imf30.hostedemail.com (Postfix) with ESMTP id 7E46580035 for ; Wed, 24 Aug 2022 11:00:14 +0000 (UTC) Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id E35F85FB51; Wed, 24 Aug 2022 13:00:12 +0200 (CEST) From: Rolf Eike Beer To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dan Carpenter , Nathan Chancellor Subject: [PATCH 7/6] mm: pagewalk: add back missing variable initializations Date: Wed, 24 Aug 2022 13:00:11 +0200 Message-ID: <2123960.ggj6I0NvhH@mobilepool36.emlix.com> In-Reply-To: <3200642.44csPzL39Z@devpool047> References: <3200642.44csPzL39Z@devpool047> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661338814; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bg7HFqGF/tbdAvHTlkJ1ZcBogoedl/BWhemBk/TCEHc=; b=LUDU1CHG/sN79pNsAEVfzS5ca7Owekun65gKW+yQXLe8wSsnLu1W1kmn8Ntnt6QrTbI5Cd Bx7EzTf4g0ZFYV3PrlMWF+eLuF1yeLupkfbGSb/UWyMvrBXmbLtedc7+DU/ApsQu9/nVBZ I275tnnaltvO8YefSyhwcgDc3WQpHAo= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf30.hostedemail.com: domain of eb@emlix.com designates 136.243.223.33 as permitted sender) smtp.mailfrom=eb@emlix.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661338814; a=rsa-sha256; cv=none; b=r2+q/6ZSK/Y3QRA4qJWYzqXuubJrlVBJaBskQ458TAcEWORVLvWjoemt1GGbrlFgNWPLlR GciZaY+yqReT4BqQrrjY5+EeUOiKJl6F0S/S4WXmX8CZ+nMx6glp9tp6CSRBp+3aDqyEzv B/GNud/mjGBu36QRx/Ptp37YCHwDzIY= Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf30.hostedemail.com: domain of eb@emlix.com designates 136.243.223.33 as permitted sender) smtp.mailfrom=eb@emlix.com X-Rspam-User: X-Stat-Signature: t837gofh3f3jk6f3jftiz5itx6bp7dgn X-Rspamd-Queue-Id: 7E46580035 X-Rspamd-Server: rspam10 X-HE-Tag: 1661338814-257144 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: These initializations accidentially got lost during refactoring. The first one can't actually be used without initialization, because walk_p4d_range() is only called when one of the 4 callbacks is set, but relying on this seems fragile. Reported-by: Linux Kernel Functional Testing Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Rolf Eike Beer Reviewed-by: Nathan Chancellor --- mm/pagewalk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Looks like my testing had just the right callbacks set so I never hit this. In case you want to have this squashed into the original one just drop me a note and I'll redo the whole series. diff --git a/mm/pagewalk.c b/mm/pagewalk.c index d8be8a30b272..22e4bcca9bee 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -223,7 +223,7 @@ static int walk_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end, p4d = p4d_offset(pgd, addr); do { - int err; + int err = 0; next = p4d_addr_end(addr, end); if (p4d_none_or_clear_bad(p4d)) { @@ -262,7 +262,7 @@ static int walk_pgd_range(unsigned long addr, unsigned long end, else pgd = pgd_offset(walk->mm, addr); do { - int err; + int err = 0; next = pgd_addr_end(addr, end); if (pgd_none_or_clear_bad(pgd)) { @@ -308,7 +308,7 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end, const struct mm_walk_ops *ops = walk->ops; for (; addr < end; addr = next) { - int err; + int err = 0; pte_t *pte = huge_pte_offset(walk->mm, addr & hmask, sz); next = hugetlb_entry_end(h, addr, end);