Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp980827pxb; Wed, 6 Apr 2022 05:58:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPXn86xWKWfoIW+kX2PAz//CdxNbOcGXYEA6tmO5Mp0TTUYBkXlUL6DP5+XHkxbsk8lEis X-Received: by 2002:a63:495b:0:b0:399:8cd:81de with SMTP id y27-20020a63495b000000b0039908cd81demr6789610pgk.508.1649249900568; Wed, 06 Apr 2022 05:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649249900; cv=none; d=google.com; s=arc-20160816; b=JyaOdkz5jJknI7QMMt1w7lt650/hKqNuN7/9Er4OLhhSU6iEYyZV85r/NFU4bFoAd5 ghWof0nzRQvCQzByuQniyXee/YKaa654LLEMJgimx4KzRED5MkjE8IJRqKbLMT4Qf598 n3TopsW8Ytdr6cs7pWKHwo/TLQL1bYPU2MC1hh54sl7UJ2J2qRQrKQST4bmO19FkFGjf foy7z9LC41ZQkFEFs8twbBG4kH1fGaK9jxronxmUy3iW00XwGt+BExNtyebVgD0VX52f hSi7GGIdgALCGnu4Cau5FmJ5w8C1lkmbIQ3LfjmdkLL/k+fYFh72RIr/cB7ObCHL+tni Kliw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OUQ4bY/6jCMH2CBrNmhGMhUotGTGli5M70VZ1LWRKmI=; b=GOoBBIAQ4GoGrSk8fD2gtojM63tkE93mGQaJ/spkXz3fIWesFuM7qKwztZKR5eHxrH fdN/brGMUIfO2qTeWm8C3BSgYPtiwCvuxrxdJaPliUxDAWWlmsgEJPeoKBzHUMLihm/D 3pUIFXfsmsHNpTgwLZd7j3kbz7EFF3HrUdZPqsA0ToAC9FKLgi18UR24bvFFoceymNT8 4gb7bACyKOycJfnY2h+N7yVNvgB72jAhMCk2mh1A3m3EvEOVIM0waDSa79Eqw/4NrMYi m81bpCeCw5o53zDYHTVgKeZp4dXhC4E1CXDWa5gz0/cUXH8mhUeuRhae9eqhe1LcIPeF Sa+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DVDnYzdE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id q12-20020a170902bd8c00b001564f2a0782si13822644pls.345.2022.04.06.05.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:58:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DVDnYzdE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D273F5670AE; Wed, 6 Apr 2022 03:09:35 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1444133AbiDEUIG (ORCPT + 99 others); Tue, 5 Apr 2022 16:08:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356161AbiDEKXC (ORCPT ); Tue, 5 Apr 2022 06:23:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54713BA32B; Tue, 5 Apr 2022 03:07:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E5DCA6172B; Tue, 5 Apr 2022 10:07:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0602FC385A2; Tue, 5 Apr 2022 10:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649153232; bh=ElByU9jTyxtaqxRWd0JpP6hYFDGkrLID+hTJ/RPQIHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DVDnYzdE7fOA4oqNaRbPOq0pXpFj+NRNSjVzcl1ZYwepaOycG0bf0IQFhKzRrh/G/ 1vyGDi/aNv63zKqqhCEfDVTb5DMdsGFtJ2Mebe9dRjH18wOGbV4NNSbDY4sowc6r6C tTDbtyCycxV8a7Jft2kb1LH8BXmJAt3S2HV+hjV0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Igor Zhbanov , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.10 148/599] PM: hibernate: fix __setup handler error handling Date: Tue, 5 Apr 2022 09:27:22 +0200 Message-Id: <20220405070303.246857642@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit ba7ffcd4c4da374b0f64666354eeeda7d3827131 ] If an invalid value is used in "resumedelay=", it is silently ignored. Add a warning message and then let the __setup handler return 1 to indicate that the kernel command line option has been handled. Fixes: 317cf7e5e85e3 ("PM / hibernate: convert simple_strtoul to kstrtoul") Signed-off-by: Randy Dunlap Reported-by: Igor Zhbanov Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/power/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index bf640fd6142a..522cb1387462 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -1323,7 +1323,7 @@ static int __init resumedelay_setup(char *str) int rc = kstrtouint(str, 0, &resume_delay); if (rc) - return rc; + pr_warn("resumedelay: bad option string '%s'\n", str); return 1; } -- 2.34.1