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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B30BCEB64DB for ; Thu, 15 Jun 2023 11:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344598AbjFOLog (ORCPT ); Thu, 15 Jun 2023 07:44:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344512AbjFOLnw (ORCPT ); Thu, 15 Jun 2023 07:43:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62E3144BD; Thu, 15 Jun 2023 04:40:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 43029639E7; Thu, 15 Jun 2023 11:40:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9774AC433CC; Thu, 15 Jun 2023 11:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686829220; bh=2ByIcyxnN5zggGi9AIVTkb8AfABO0oZ9oy71RHOyZwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUWqrjdFQtcTuIIf7OwDgchu3niMuIb4rJOrMmHCZ7L1kM4YjVNTz5u/wZ+oc04vN oWiQZ092nGie8x5N9+p29Z810SLizRKSFMI/hGC4GBWehCuYNvRL0MIJJ2/JTW/Mp5 zriPpHXHYEnzYFFpldpggEsFpvO9/ZD6kqCXqhTfdliab2KV7qThoKfQROTogStY2H wsFMoPcQkwG7UdWZdAZRVlxrPbo7i98XhMeiWFgQNq9UfOwA2yiA7wSTCX7R0fXxxE QNKOa+pPkcMfRbpC9bJDWY7l7szIoMriNtd6aD0O+GRsZUH1+TinkuJ8r6yOBTLdfE YqyfVNDgwa3bg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Denis Arefev , Ping Cheng , Jiri Kosina , Sasha Levin , jason.gerecke@wacom.com, jikos@kernel.org, benjamin.tissoires@redhat.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 2/6] HID: wacom: Add error check to wacom_parse_and_register() Date: Thu, 15 Jun 2023 07:40:10 -0400 Message-Id: <20230615114016.649846-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615114016.649846-1-sashal@kernel.org> References: <20230615114016.649846-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.318 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Denis Arefev [ Upstream commit 16a9c24f24fbe4564284eb575b18cc20586b9270 ] Added a variable check and transition in case of an error Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Denis Arefev Reviewed-by: Ping Cheng Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/wacom_sys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 3d521f289984a..28e7a4950b74a 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -2251,8 +2251,13 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) goto fail_quirks; } - if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) + if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) { error = hid_hw_open(hdev); + if (error) { + hid_err(hdev, "hw open failed\n"); + goto fail_quirks; + } + } wacom_set_shared_values(wacom_wac); devres_close_group(&hdev->dev, wacom); -- 2.39.2