[4.9,09/29] HID: i2c-hid: fix format string mismatch

Message ID	20210608175928.120985240@linuxfoundation.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Nathan Chancellor <nathan@kernel.org>, Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 09/29] HID: i2c-hid: fix format string mismatch Date: Tue, 8 Jun 2021 20:27:03 +0200 Message-Id: <20210608175928.120985240@linuxfoundation.org> In-Reply-To: <20210608175927.821075974@linuxfoundation.org> References: <20210608175927.821075974@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/29] efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared [4.9,03/29] efi: cper: fix snprintf() use in cper_dimm_err_location() [4.9,04/29] vfio/pci: Fix error return code in vfio_ecap_init() [4.9,05/29] vfio/pci: zap_vma_ptes() needs MMU [4.9,06/29] vfio/platform: fix module_put call in error flow [4.9,07/29] ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service [4.9,08/29] HID: pidff: fix error return code in hid_pidff_init() [4.9,09/29] HID: i2c-hid: fix format string mismatch [4.9,10/29] netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches [4.9,11/29] ieee802154: fix error return code in ieee802154_add_iface() [4.9,12/29] ieee802154: fix error return code in ieee802154_llsec_getparams() [4.9,13/29] Bluetooth: fix the erroneous flush_work() order [4.9,14/29] Bluetooth: use correct lock to prevent UAF of hdev object [4.9,15/29] net: caif: added cfserl_release function [4.9,16/29] net: caif: add proper error handling [4.9,17/29] net: caif: fix memory leak in caif_device_notify [4.9,18/29] net: caif: fix memory leak in cfusbl_device_notify [4.9,19/29] ALSA: timer: Fix master timer notification [4.9,20/29] ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed [4.9,21/29] pid: take a reference when initializing `cad_pid` [4.9,22/29] ocfs2: fix data corruption by fallocate [4.9,23/29] nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect [4.9,24/29] btrfs: fix error handling in btrfs_del_csums [4.9,25/29] btrfs: fixup error handling in fixup_inode_link_counts [4.9,26/29] bnxt_en: Remove the setting of dev_port. [4.9,27/29] KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode [4.9,28/29] arm64: Remove unimplemented syscall log message [4.9,29/29] xen-pciback: redo VF placement in the virtual topology

Message ID

20210608175928.120985240@linuxfoundation.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org
	designates 23.128.96.18 as permitted sender)
	client-ip=23.128.96.18; 
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Nathan Chancellor <nathan@kernel.org>,
	Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.9 09/29] HID: i2c-hid: fix format string mismatch
Date: Tue,  8 Jun 2021 20:27:03 +0200
Message-Id: <20210608175928.120985240@linuxfoundation.org>
In-Reply-To: <20210608175927.821075974@linuxfoundation.org>
References: <20210608175927.821075974@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH June 8, 2021, 6:27 p.m. UTC

From: Arnd Bergmann <arnd@arndb.de>


[ Upstream commit dc5f9f55502e13ba05731d5046a14620aa2ff456 ]

clang doesn't like printing a 32-bit integer using %hX format string:

drivers/hid/i2c-hid/i2c-hid-core.c:994:18: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [-Werror,-Wformat]
                 client->name, hid->vendor, hid->product);
                               ^~~~~~~~~~~
drivers/hid/i2c-hid/i2c-hid-core.c:994:31: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [-Werror,-Wformat]
                 client->name, hid->vendor, hid->product);
                                            ^~~~~~~~~~~~

Use an explicit cast to truncate it to the low 16 bits instead.

Fixes: 9ee3e06610fd ("HID: i2c-hid: override HID descriptors for certain devices")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---
 drivers/hid/i2c-hid/i2c-hid-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.30.2

diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index 606fd875740c..800c477dd076 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -1157,8 +1157,8 @@  static int i2c_hid_probe(struct i2c_client *client,
 	hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID);
 	hid->product = le16_to_cpu(ihid->hdesc.wProductID);
 
-	snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX",
-		 client->name, hid->vendor, hid->product);
+	snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X",
+		 client->name, (u16)hid->vendor, (u16)hid->product);
 	strlcpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys));
 
 	ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product);

[4.9,09/29] HID: i2c-hid: fix format string mismatch

Commit Message

Patch