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 B058813DDDD; Thu, 11 Apr 2024 09:58:48 +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=1712829528; cv=none; b=JiHZuJUN+TpDfSkfhLMYO2SxU2nLewt+7m8r32bmQOAmDmpeF4q9Gw7AytUwh6yS+/60Z0W+lXHIh+c+pS2IPTAvu4TStQMok/1nG03QIDo2Twd5PfaQEJw7hl6Jjr0Uo67HCDuS4FFu623qvdmay3jlc8NQRxDCTNbX2O8sP0c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712829528; c=relaxed/simple; bh=v2bHe0LdB7jBZULYIV20m2mC53LUFceWcXvKo3ALCc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gS7mrCt2o4B678iVayhZ/8meNC+sWBbh5Q4hdZZsVrsSiq9yc0wQS/tA0BkX0YBzdYBJ/2NhNMs6Gw2WcWkztnROkjK9JLhsv4d0wCmPOyGS91IBZ0ePAP1XTA8/hqjxlxI5usOtnfyZkVlTrbf3rU0MwFIqmTelLnuwxue19yA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ipZJA9+B; 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="ipZJA9+B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FB46C433F1; Thu, 11 Apr 2024 09:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712829528; bh=v2bHe0LdB7jBZULYIV20m2mC53LUFceWcXvKo3ALCc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ipZJA9+BFpdneehxv+VmrPqkquS3w00qH5dyD5YFBH5eUiqIbps2ZOEcU4JQuf3eI t+nayEjJfLQqyAy+BzEkKkrCXXCiponBU1wavzXthB9wyYF/WDaBWhHu6ntx75wnqD 2BGLuZ3ex/voMWueIBAK5wm6LQVqIxb6NiTsQrbY= 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 4.19 018/175] sparc: vDSO: fix return value of __setup handler Date: Thu, 11 Apr 2024 11:54:01 +0200 Message-ID: <20240411095420.097191502@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095419.532012976@linuxfoundation.org> References: <20240411095419.532012976@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 4.19-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 5eaff3c1aa0c7..1869e4b36db21 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -262,9 +262,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