From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C0CF47A7A; Mon, 1 Apr 2024 15:52:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711986732; cv=none; b=irzkWXapUj/Luq92nA43T8+20LybLwWerYV1VXDLuy2mqeZVSAC2ShSW5XMKKzFGO+OQkOR7fFjjJAxlcIPRwTsPd/fwTpyOO/l91TQ22lieP0yYKDfuDL22Gp1gPEKowWFacrpGauC6jkMWsv/3GC+7fKeP/d9u676yLp52D7U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711986732; c=relaxed/simple; bh=NPqxxhBCvVgttFexNHcHY7IJXs2qgdXMhPMm7uUEBFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sPGBkagdUQxAtv8xugaKMI/8bntzVsjtLasTeiWVfl+qo0GZTKQeFq8e8xxERQfYQD4TfwaChy/Mhg/scSKfXgtoagAf+a8GNmsS4tMdcx3R4h3Ey76CnK2bHS9GcFcwq/6DBPR5GxeWKK55PfQyYZxR2Fn3IPx7UF5RHVA/sJw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fGehVdDG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fGehVdDG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9052C433F1; Mon, 1 Apr 2024 15:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711986732; bh=NPqxxhBCvVgttFexNHcHY7IJXs2qgdXMhPMm7uUEBFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fGehVdDGE0hi0ZXC3rU0Rg9cYWvpWoUmnntJMB4ZakxAl/ZP0FUDMiPsAV1MtwpZj 3b4cLAeWM7l7yjU/tdh2hgNAeG5zaSNaIWXIgQ/jbZuS9TzENPI2WSuQDha4S1EJ3P 3eQz8bk7VOpojCmsiEFAXocyKPUuwRz6IOci8P/A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Randy Dunlap , Igor Zhbanov , "David S. Miller" , sparclinux@vger.kernel.org, Dan Carpenter , Nick Alcock , Sam Ravnborg , Andrew Morton , Arnd Bergmann , Andreas Larsson , Sasha Levin Subject: [PATCH 6.8 037/399] sparc: vDSO: fix return value of __setup handler Date: Mon, 1 Apr 2024 17:40:03 +0200 Message-ID: <20240401152550.273320407@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152549.131030308@linuxfoundation.org> References: <20240401152549.131030308@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Randy Dunlap [ Upstream commit 5378f00c935bebb846b1fdb0e79cb76c137c56b5 ] __setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from vdso_setup(). Fixes: 9a08862a5d2e ("vDSO for sparc") Signed-off-by: Randy Dunlap Reported-by: Igor Zhbanov Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Cc: Dan Carpenter Cc: Nick Alcock Cc: Sam Ravnborg Cc: Andrew Morton Cc: stable@vger.kernel.org Cc: Arnd Bergmann Cc: Andreas Larsson Signed-off-by: Andreas Larsson Link: https://lore.kernel.org/r/20240211052808.22635-1-rdunlap@infradead.org Signed-off-by: Sasha Levin --- arch/sparc/vdso/vma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c index 136c78f28f8ba..1bbf4335de454 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -449,9 +449,8 @@ static __init int vdso_setup(char *s) unsigned long val; err = kstrtoul(s, 10, &val); - if (err) - return err; - vdso_enabled = val; - return 0; + if (!err) + vdso_enabled = val; + return 1; } __setup("vdso=", vdso_setup); -- 2.43.0