From patchwork Thu Sep 21 07:01:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 143100 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5276589vqi; Thu, 21 Sep 2023 19:30:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNoW7Xl2xBzGLhqjoUADnwb4bM85XWomGv3j1Usjf3ZZPOYxwMLV+zsG8Nv3WH2OIKHsjs X-Received: by 2002:a05:6102:101:b0:452:700c:7230 with SMTP id z1-20020a056102010100b00452700c7230mr8148825vsq.8.1695349855060; Thu, 21 Sep 2023 19:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695349855; cv=none; d=google.com; s=arc-20160816; b=JQRDZ4AhhKE/45+E27XVVizjrqvAEoxfAqrhfkQFC9GBhbWWY/N8G9K0QMPIUJMqIj w85f1zPUjZqNc8O1ysltTEWnHIvJW/u5Q+Xl2AxCWr7EERhZQi7gmSw2hraY5DJzz2dR ICVpEP8qjzimO8oJTCGWwN0dXNPi+9P5aDvO6Me23VGbFRGgc7rnf793BKkmcjjAK2Nb 7mQeJNuiiVW4e+GGE08kewPVDInE2yqXRMk+ldoWGrlVxjQ8jKf/GU3CQdM/nEKASyB4 0cqtB8eeVWqqfl9E4yASoWY99XFJ8J2X2BKJIthTPauY+5K158Jc/YpTQ6K/UCMeWIw8 IHZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=PCRMmvveaVcVSR15oJLrWC1xgCD5rCKuEjC1MAuPd54=; fh=lWph0NMTwLS6lbLO4IT26RYjMqsVwSnxNOikogOy0Jc=; b=VqTE83t6as/4ylXCvzLq+Q4vFxMh23jlcHp10CCy0AOh+RIoGzDqWWHww6kWKnzZ/o 7aS8y6zzYJPVmwOgU0QNLIQKcqJvoo4ShG95LM31HV3I7fczVOOX99sM1aYQz6/BXC9w lHQEAI0b3sUgusoKfv4T82FK5xdvUQ6L0ywc4+5G8KE6iOZTWEYquRUpHiBlrUt4Wx1Z LH8jeoknBDqdBUQd06hQktX6mrt9gaEnZ/URWeiVfPfnk5IE9mITxUcgrucxZujH3xM6 KCijG66fNjKg4M1hk7jPH5EWWzKShOWjigGsXHhxepyIKEHJP6HQqe4QPZHSiOzBgL0l hBow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=idR2iEad; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id w191-20020a6382c8000000b00578bb5917d7si2873241pgd.153.2023.09.21.19.30.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 19:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=idR2iEad; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 44BB08025816; Thu, 21 Sep 2023 11:53:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230304AbjIUSxT (ORCPT + 28 others); Thu, 21 Sep 2023 14:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230388AbjIUSw4 (ORCPT ); Thu, 21 Sep 2023 14:52:56 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CF7E914CE for ; Thu, 21 Sep 2023 11:37:02 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-594e1154756so19069977b3.2 for ; Thu, 21 Sep 2023 11:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695321421; x=1695926221; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=PCRMmvveaVcVSR15oJLrWC1xgCD5rCKuEjC1MAuPd54=; b=idR2iEadyqJxkAsH08qLLyoqppSbX03t2NeNbegltn8D1OC6kGbWlQEzrVKdwglyJT tfSVsFHn/rw3k/r2LBOVoucLWHR4PAU5nEwQpd140N6Vz7vc/aDu8Ze6207UA2+Y+Ns7 k9RvqEVdedVC5rtoT+5yRlGJgXZWgFKRjrc0xcCIEMfeFeCCgONXQeQSuwqarMMacNpA wsssmFdsOhg5ZvFx8dLsukw7B1JrKOpr4OtqJcaEAgE8jHxF0l5wP2LQvdOVuLyVewWr dZq/olylhl9/tT7E9C+6XARZZei58ovqklqFxV9+kodje1B04T9euwPpDyXsOBZHg9Co 6AoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695321421; x=1695926221; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PCRMmvveaVcVSR15oJLrWC1xgCD5rCKuEjC1MAuPd54=; b=mUP5OCct5kBQUksrpa6OeQzTAfCIZpQJHPkA1L1fpcdMSI6RCVwmFWVEXWjc8BYAof VXqs3wHmMMxOlY574Gt+ff95w+PYGwf6YwRo9kNob0QeBFw4Hd2Eq4KPyqFhwXtUxSkO 50zEbDTeZdTU1bH777wXjM74Ox7eqaDRCwi6Yi1010A2409H94Jbqnkz7EPSC6b2VMOE YcAb2RpSKW6sNNi4XQ7zX4+tkH0npuGONwrzjvYaf82wk3PE4eyb1NzDXvBmxUbzRXwX cz8Dg+Jmp2WNOzyfxBciM6QBgI2pgYHQcIur/niv6cEVYdsMWUTMeetFaobPKh3t4qNp YwuQ== X-Gm-Message-State: AOJu0YzLywQDHPFGJkkGNJZhCBlrWJkw5hFkUNO1eexvHKZPi22cMzIF kyiP8mW71fIps4E5xFAZbqLzM1irkPBH2dtJcQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:ce49:0:b0:d80:ff9:d19e with SMTP id x70-20020a25ce49000000b00d800ff9d19emr63960ybe.9.1695279663292; Thu, 21 Sep 2023 00:01:03 -0700 (PDT) Date: Thu, 21 Sep 2023 07:01:01 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAC3qC2UC/x3NwQqDMAyA4VeRnBeojei6Vxk7jJptOawtiUhFf HeLx+/y/zsYq7DBo9tBeRWTnBr6Wwfx905fRpmbwTtPLvgebdEUy4azyspqKJKxaK7yl2VDq4H 8gBHvkQaaxml0FKDFivJH6jV6vo7jBIHQTo14AAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695279662; l=2848; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=9jDyBMkgavsnNjxewPyVtkova19FE84VVZK9Pvb/rDk=; b=e5TEjYsjowMhf9fPiePv9hrz9ZlUb1GRwFyDE70vdQLcICQkLpAoogAgOXukubFmfNkqyHkBm i+6F0QbTVSPBtqz25d/Mw5nxuJ1Y4S/g8IQULtXS2wdUiW7lNb3r3H6 X-Mailer: b4 0.12.3 Message-ID: <20230921-strncpy-drivers-iio-proximity-sx9324-c-v1-1-4e8d28fd1e7c@google.com> Subject: [PATCH] iio: sx9324: replace deprecated strncpy From: Justin Stitt To: Jonathan Cameron , Lars-Peter Clausen Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DATE_IN_PAST_06_12, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 21 Sep 2023 11:53:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777703169469414867 X-GMAIL-MSGID: 1777703169469414867 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. We should prefer more robust and less ambiguous string interfaces. `prop` is defined as this string literal with size 30 (including null): | #define SX9324_PROXRAW_DEF "semtech,ph01-proxraw-strength" | char prop[] = SX9324_PROXRAW_DEF; Each of the strncpy->strscpy replacements involve string literals with a size less than 30 which means there are no current problems with how strncpy is used. However, let's move away from using strncpy entirely. A suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. Moreover, let's opt for the more conventional `sizeof()` as opposed to `ARRAY_SIZE` for these simple strings. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt --- FWIW: It seems fragile to base future `prop` stores on the size of it's default string. Note: build-tested --- drivers/iio/proximity/sx9324.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) --- base-commit: 2cf0f715623872823a72e451243bbf555d10d032 change-id: 20230921-strncpy-drivers-iio-proximity-sx9324-c-8c3437676039 Best regards, -- Justin Stitt diff --git a/drivers/iio/proximity/sx9324.c b/drivers/iio/proximity/sx9324.c index 438f9c9aba6e..25ac2733bcef 100644 --- a/drivers/iio/proximity/sx9324.c +++ b/drivers/iio/proximity/sx9324.c @@ -937,11 +937,9 @@ sx9324_get_default_reg(struct device *dev, int idx, case SX9324_REG_AFE_CTRL4: case SX9324_REG_AFE_CTRL7: if (reg_def->reg == SX9324_REG_AFE_CTRL4) - strncpy(prop, "semtech,ph01-resolution", - ARRAY_SIZE(prop)); + strscpy(prop, "semtech,ph01-resolution", sizeof(prop)); else - strncpy(prop, "semtech,ph23-resolution", - ARRAY_SIZE(prop)); + strscpy(prop, "semtech,ph23-resolution", sizeof(prop)); ret = device_property_read_u32(dev, prop, &raw); if (ret) @@ -1012,11 +1010,9 @@ sx9324_get_default_reg(struct device *dev, int idx, case SX9324_REG_PROX_CTRL0: case SX9324_REG_PROX_CTRL1: if (reg_def->reg == SX9324_REG_PROX_CTRL0) - strncpy(prop, "semtech,ph01-proxraw-strength", - ARRAY_SIZE(prop)); + strscpy(prop, "semtech,ph01-proxraw-strength", sizeof(prop)); else - strncpy(prop, "semtech,ph23-proxraw-strength", - ARRAY_SIZE(prop)); + strscpy(prop, "semtech,ph23-proxraw-strength", sizeof(prop)); ret = device_property_read_u32(dev, prop, &raw); if (ret) break;