From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0686C33CB3 for ; Thu, 16 Jan 2020 18:19:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 849162176D for ; Thu, 16 Jan 2020 18:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579198753; bh=859azOcWJvnsvCe8TSmd7tCdttaY9u5Jitr3v5vA3LM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Kv3IvDw3RDKw7gHIvHtJIg+OxdJn7EHaK/kC5rw8K/Ij8jnArJAuxTHi6OSf2IMTF k5rFiKciWKkz7ITNFpWMebGtz+bHbF2Wi8cmBuAnLMC1sid+mHIzLUvdHuemXSEvaC 7jfPAggIHzuaiWijYkSeTSc3lJmvSQNnufJwVSVA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392606AbgAPR2g (ORCPT ); Thu, 16 Jan 2020 12:28:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:39410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404207AbgAPR2X (ORCPT ); Thu, 16 Jan 2020 12:28:23 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CB79F246F2; Thu, 16 Jan 2020 17:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195702; bh=859azOcWJvnsvCe8TSmd7tCdttaY9u5Jitr3v5vA3LM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rzwzvl5Ct6OrMm9+Te/lLJ1xzp0UjR7naHRhPjCGIjbhHjzQrg2XaD4Y+YQYoXZi5 WpGJpfZHpEEIISpGgwpHxXMANReEgkgx32ktaHDQNOCGeRcMkx7ZFUy0DwGWz2SdKs OJhQbTM/7VdWiXY0maJ4AV3w/VdlQuyeFp4HmQhc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Rafael J. Wysocki" , Thomas Gleixner , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 250/371] PM: sleep: Fix possible overflow in pm_system_cancel_wakeup() Date: Thu, 16 Jan 2020 12:22:02 -0500 Message-Id: <20200116172403.18149-193-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Rafael J. Wysocki" [ Upstream commit 2933954b71f10d392764f95eec0f0aa2d103054b ] It is not actually guaranteed that pm_abort_suspend will be nonzero when pm_system_cancel_wakeup() is called which may lead to subtle issues, so make it use atomic_dec_if_positive() instead of atomic_dec() for the safety sake. Fixes: 33e4f80ee69b ("ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle") Signed-off-by: Rafael J. Wysocki Acked-by: Thomas Gleixner Signed-off-by: Sasha Levin --- drivers/base/power/wakeup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index df53e2b3296b..877b2a1767a5 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -877,7 +877,7 @@ EXPORT_SYMBOL_GPL(pm_system_wakeup); void pm_system_cancel_wakeup(void) { - atomic_dec(&pm_abort_suspend); + atomic_dec_if_positive(&pm_abort_suspend); } void pm_wakeup_clear(bool reset) -- 2.20.1