Received: by 2002:a19:f614:0:0:0:0:0 with SMTP id x20csp66561lfe; Fri, 15 Apr 2022 19:49:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyT7ODTMhjXWikQ1nHPD/lMHyChTWTu05tPkBT1LukxesSsOQJktUwNK/X7FHqfAAVvMfE0 X-Received: by 2002:a05:6a00:1256:b0:4fb:1374:2f65 with SMTP id u22-20020a056a00125600b004fb13742f65mr1939099pfi.72.1650077371858; Fri, 15 Apr 2022 19:49:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650077371; cv=none; d=google.com; s=arc-20160816; b=B/L0828PxB189wQN1jYuB21CY2WkPUCrHx3IR0RM80xm9Ig4X7C77e/QigQ87VunGC hcp7xtily2IpO6W/gogbPTgCDfVn2bDGtnEbblS3KHKpAQJd5sckJPoycYeI8rBL3shA v9egT+SyC6sPrr+c3YMj4owjsr40J12cTmaLf8jSvemY+9Io4+BL2EBZRy2wsAz4wQkD M6hR3zxq1fBTBjU668VMd7ltKwcI2Ak9g8F5MqN5OLu55T0GinSiu+uR5z1vTpF6G80k ivK4Mri0m9ANsUisExwSRxUe9o4AB1fMZE1jknuXYt2HfeZyIoojg++uNF1JKYbjCFSG TONQ== 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=rQ1GdQrkm3fER05/5Odp8GW7lwZkRt6TyuqEgyxLVlc=; b=YkD/dz2JQgnOP3bYRR8SQBaru9qMOAg5PrYPO+Ov7pFvDs2G+Cuhb7VwBb6CCWhAEd qlcbwHWy8yDfyBQkQupqKwEVnmNLbP23GVHcYcwuzVmvi7v9JNMTG1s3j2i2LYS1Yh2B I9gW8VArQMz1gKI3ybzi0d1HKPxcYjrI2GSGcBBSUUucjAoge9B8yHXcsJg2dAqNKg5q CNTjFl+9w8zOd2LmKgaGzjAerwuBepZYi95CF3tD/yOcpKs8kcTqPShBiBdKOZ+X+0RO ak5oOC0k2xdBB+RM209dPIgYvWqYBeM3Rb1bL3ytd5VuEC5f/4JeErkRJfCbLiAAJTxU 6Wfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xP2AH1Lj; 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 i13-20020a639d0d000000b0039ccd85fbb1si3127899pgd.131.2022.04.15.19.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 19:49:31 -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=xP2AH1Lj; 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 E0AD8DF07; Fri, 15 Apr 2022 19:07:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244257AbiDNNYT (ORCPT + 99 others); Thu, 14 Apr 2022 09:24:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244132AbiDNNWb (ORCPT ); Thu, 14 Apr 2022 09:22:31 -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 69DE7985BC; Thu, 14 Apr 2022 06:17:48 -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 F1CE6612FE; Thu, 14 Apr 2022 13:17:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09392C385B8; Thu, 14 Apr 2022 13:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649942267; bh=/P93I739uQcQRexDKRSXGmAGglFzxtv2iRkZGzvIemo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xP2AH1Lj7jHZDR5qry6WO73v0Y2AEquvAbUksyH63REGe3B4sNr+Sn1ghPMVdZeTy e9Pz+8b+BRs11JPv+qLLLvIyIKQWqIk3BC8x9cdteBZBlfBO3dFTd8yaP+XYzB82J2 wpyKACiorjR5orLHM+aHOobgwsVVzxKRWap7zHS4= 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 4.19 075/338] PM: hibernate: fix __setup handler error handling Date: Thu, 14 Apr 2022 15:09:38 +0200 Message-Id: <20220414110841.034367416@linuxfoundation.org> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220414110838.883074566@linuxfoundation.org> References: <20220414110838.883074566@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 6670a44ec5d4..6abdfdf571ee 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -1219,7 +1219,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