From patchwork Tue Mar 23 13:14:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 406875 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4443990jai; Tue, 23 Mar 2021 06:16:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz538JVzBbX3lbqeImdHav1l0KqKCbRsRjwZgn25RC81sboCinwazw80R8tSfEgBMJbdNVx X-Received: by 2002:a05:6402:1cc1:: with SMTP id ds1mr4484504edb.135.1616505361129; Tue, 23 Mar 2021 06:16:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616505361; cv=none; d=google.com; s=arc-20160816; b=vbT3FmR40VIoWXq4PCuRGYyAbmryLWxVhr+oSuTWd1HaRqgrRXJF1/4cN2sb2huUUY LZ9/UKJOJ8eScETcAxG46gquoAym5jdSxc89xuvbEoEyxi9hPys5AniZYBbAmer27N/r TOyw6i/+M8rNFbiBBUzEhaoNub8bcb7cNbsV3FO8oXhr3Z9y5A7yeAnCtSbQZLTl98tX ZH0kPzDmhpeRW8xPOnuFhJCQOxaslTfZXYvBRaatZpKfYcAigUQktk+VYMwTMIqwcV37 6+YDELH02RlpvpXS4kYC4S5hXcTbQAGx58EXaZkSpax8CxxW2pneS6S/8ZO9Tp/NHSVW xVxg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=u81Cv60xYNeAMRCEtIDRscyRHoBGS+qrfIH1ivIizFU=; b=pxbP8T2RCwz+gRdX57RT/1YIgy2G6Qf6AaOaHZVmSUr7RfyUJkFjQZGGOFTS337kXe WA+HxGM7hADFeORg1jVT8txrAfgDMLWtFxLPcMmwPUSRUwxXUjXUTShXvW5YD/N7Kuhc DIWSXRWdfsZiHzscusIvJgTo9myZR9h7rTfMCltV8/o6rsTQDrH6wOHFOxxw8URbb5mW w0HTlWcpdthyf1O374jGJodRu44thcz8EEhh5Do4NWSfy/4j01dYFNv1Xowl7NFzHh+Z BlFqOodUfzgj+MSXxbDqTSVcHJWYzdfkC8LBqGSuZJifL8wUCAovxIdRLj1WrPslyIlU +57A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gJi5SVgZ; spf=pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n23si13385339ejs.705.2021.03.23.06.16.00; Tue, 23 Mar 2021 06:16:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gJi5SVgZ; spf=pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231839AbhCWNP2 (ORCPT + 1 other); Tue, 23 Mar 2021 09:15:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:45294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231604AbhCWNPC (ORCPT ); Tue, 23 Mar 2021 09:15:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6D31161990; Tue, 23 Mar 2021 13:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616505299; bh=oZWMWFmkjgEXpfFZpnhWD7nZruvCO/j1q+o49Q6vXsI=; h=From:To:Cc:Subject:Date:From; b=gJi5SVgZwxCnk/OsOMJBb/xRicHFr1hntHN72DxBJb7F8o3Pqs2ZZ1dD70pQP8caU 9/6AzducHf/9WDhtkWdRgNF6jdmZCPl77JzYmkZF5mnNVmT3KCGQj26ZbsVtx7EixN 5Jdh+ddoxe2vy8Zbi2zb6Ztgs7X5F2ffC4GkjlKbfzbeSe5nonSNCdLO/WUfBA21s2 DSAAXFCQ3UG/5w80ftGe0ecxnN+7X10QOFPzCkhge4Y5mfdb6NIHasbAGfpX3TetnO GP09XUfJbmmEsyQrHxbBLqIIEt2k3MHofwIfUBuqdDfhsAoaBdkd42i/SBDkOL1j9p s9JhcwPmlzOag== From: Arnd Bergmann To: Dmitry Torokhov Cc: Arnd Bergmann , Zhang Qilong , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Input: analog - fix invalid snprintf() call Date: Tue, 23 Mar 2021 14:14:50 +0100 Message-Id: <20210323131456.2600132-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Arnd Bergmann overlapping input and output arguments to snprintf() are undefined behavior in C99: drivers/input/joystick/analog.c: In function 'analog_name': drivers/input/joystick/analog.c:428:3: error: 'snprintf' argument 4 overlaps destination object 'analog' [-Werror=restrict] 428 | snprintf(analog->name, sizeof(analog->name), "%s %d-hat", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 429 | analog->name, hweight16(analog->mask & ANALOG_HATS_ALL)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/input/joystick/analog.c:420:40: note: destination object referenced by 'restrict'-qualified argument 1 was declared here 420 | static void analog_name(struct analog *analog) | ~~~~~~~~~~~~~~~^~~~~~ Change this function to just use the offset it already knows. Signed-off-by: Arnd Bergmann --- drivers/input/joystick/analog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index f798922a4598..8c9fed3f13e2 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -419,14 +419,16 @@ static void analog_calibrate_timer(struct analog_port *port) static void analog_name(struct analog *analog) { - snprintf(analog->name, sizeof(analog->name), "Analog %d-axis %d-button", + int len; + + len = snprintf(analog->name, sizeof(analog->name), "Analog %d-axis %d-button", hweight8(analog->mask & ANALOG_AXES_STD), hweight8(analog->mask & ANALOG_BTNS_STD) + !!(analog->mask & ANALOG_BTNS_CHF) * 2 + hweight16(analog->mask & ANALOG_BTNS_GAMEPAD) + !!(analog->mask & ANALOG_HBTN_CHF) * 4); if (analog->mask & ANALOG_HATS_ALL) - snprintf(analog->name, sizeof(analog->name), "%s %d-hat", - analog->name, hweight16(analog->mask & ANALOG_HATS_ALL)); + len += snprintf(analog->name + len, sizeof(analog->name) - len, "%d-hat", + hweight16(analog->mask & ANALOG_HATS_ALL)); if (analog->mask & ANALOG_HAT_FCS) strlcat(analog->name, " FCS", sizeof(analog->name));