From patchwork Mon Sep 18 05:30:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 141281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2491862vqi; Mon, 18 Sep 2023 00:50:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNVF5nyEad0xG6Qox8VaxZehWNDOxNxH1zQh4L/Mk/TYbsyId52zZaAnrZd4BzJXV2pCIO X-Received: by 2002:a05:6a21:338f:b0:159:e0b9:bd25 with SMTP id yy15-20020a056a21338f00b00159e0b9bd25mr8024954pzb.57.1695023456365; Mon, 18 Sep 2023 00:50:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695023456; cv=none; d=google.com; s=arc-20160816; b=LcE++nxbdMQI04kS7SNObAI367c0+jlYkbmU0emTH8BYm/pdk8mBQF78xRgzzUE1XX Oj2Mlkp4ILjVmuKwiLXb/4MMclpkqGdO0Jw7d2rn+kk69NP41vVmCbDN/JiW8A/ZbN5d 2BVeVeAdzAWxiOQxzlgjH6rXg8bxL2ELQMdKtD+a0taN55nHfm8EsUBM5hTKNe0nijwn 28xONuCUH+WQhZu2XTfWs55+FgsvhGdYRGyv9S42MwJ1K9zIHj4xp0SOTgXPOQEdcM9T XxmL9ceqSgcMmL3eTmS2Lb9GKdXL7PyRRcze3bSIxYzGnhb2tBObVRF7kbMy+TXVFCNV qE3w== 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=OE+ciIbOkP2gbp6T+0Gt73rrnC9CJepjybcVkk4F57E=; fh=TRbSTcA6VS/TU2W3kqjViVED/bCxU74qomFPNpkOvUg=; b=z2iiP+iLm1uxrWDswxwvqJSBQpyiG14pgI+5+m3sF6uhYrSmdW0g8y4xYtm2cB8xe4 hyZYoelz48Jb2JIBzo6lafy5TSCeOh7FAFUzlsHyiD6xSsBiY8zNmZ7fxaNK+NWBTvmN mcRzxPjPJifLHtIH9YRd8uH0HCRnwf2trHrGxjXAj0DL6EVWLOT+w6+US5/+32wESAkB mBVYeDQGWmMlBjIl50Grl3MrdaK3GO8SUTC7zznlmzhSZJzzZynhg9dUFGpA1Si8zpec dxMQFp1WSRyWYUkZ0shb9fspdyLd995ZIv4B9pu6bN+oMqSfUFvHLyMzbz6ExXfGsa/h 0dcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=SpN7mw8P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id q5-20020a656845000000b0056947b9539dsi7321037pgt.354.2023.09.18.00.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 00:50:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=SpN7mw8P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 1EB6D81CE84A; Sun, 17 Sep 2023 22:32:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239651AbjIRFas (ORCPT + 28 others); Mon, 18 Sep 2023 01:30:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239689AbjIRFac (ORCPT ); Mon, 18 Sep 2023 01:30:32 -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 A28B2120 for ; Sun, 17 Sep 2023 22:30:24 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59c0eb18f09so29710127b3.2 for ; Sun, 17 Sep 2023 22:30:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695015024; x=1695619824; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=OE+ciIbOkP2gbp6T+0Gt73rrnC9CJepjybcVkk4F57E=; b=SpN7mw8PtIDl103YYs8oSKP3kAl88Fc6exiO7BLsAsY/lhqk/GzBINKq3ANjhiMO/O P6WDoBy8Zl+cszPWDH+eT1x6nTTE/RipX/tpznLD96JRM8QGkIMwaZY4rdciVjbXcUlM 2pRyDnoajiz/+jRmtAFGGUVb+3ke/gB9CMj6VeXUzsP+KNWTjksGGXOCdSRyYPW4WaCd dYaOOQzTzUnqLC1J1zM0T6H0CqG5QlusY9ltFR8Gn/Coj8WT+1934GBJMaaYg154SklK c4T2Y7tPkd93qIGN+1QvPNqi+tjV7PUTVJZLON9HYnNTLc7Bt1b3Z4cPaU5Yui1G5A8T fB+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695015024; x=1695619824; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=OE+ciIbOkP2gbp6T+0Gt73rrnC9CJepjybcVkk4F57E=; b=HtboiIMVGbrFOVrmD84/gcsn+JDLsRcND50e8nXUdlfF4P6jyc0LJWu8W2a44K0J1u DkLeRO/N57j39uAYcvrWIJ3KAiZQRsFN3e24w0R5h09fDf4QpSKQRnl6RusGdxFZGPmP NXg1PxxD4V1NqsJIWTU7R+kcgnmAk+VCDqPqT5Bds7DhJ9aokEcteA3HU/lawXlCc3uU Kcqjt+CGmpobcYhN6qMzHUrxfQy42wxXzQPrilBDp5YDLWRx8vtxF9hPY7rGt8u/nGM4 xHqBVvGOA55/OAL4FQl1xHYnuVUyz06uBrBz/0LquSQ3jQEQUQN1LB6N6opTJFzku+cv P1Dg== X-Gm-Message-State: AOJu0Yy7zNCW/1Ge2+ctjWq2Me/y0PNmwsWFAaNIHMs9XivryhY+ckhz 3hkZj1DdPKoC3vvdhLpAdIL8BzmSdxdpAN/tVA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a81:b61c:0:b0:59b:edd3:fdab with SMTP id u28-20020a81b61c000000b0059bedd3fdabmr201776ywh.4.1695015023902; Sun, 17 Sep 2023 22:30:23 -0700 (PDT) Date: Mon, 18 Sep 2023 05:30:15 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGbgB2UC/6WOQQ6CMBBFr2K6dkxbiIor72FYlDLACNKmUxsJ4 e5WruDyvcV/fxWMgZDF7bCKgImY3JxBHw/CDmbuEajNLLTUhbzqEjiG2foF2kAJA4OxFpmpoYn iAuzRjG8Po2ueaCODhVLKCi9tJ6viLPKsD9jRZ08+6swDcXRh2R8k9bN/xJICBYVR2CmtFVby3 jvXT3iy7iXqbdu+gL2JHfEAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695015023; l=2339; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=ZRAevJITjeQ3gig5kuCzdgxw+0nnBqh8Vks2uPOz8VQ=; b=BYbtuoA82mn5rA+ynVQEmlpFtq1oD0knVDz6B12KBhox6dKe5/z1nyregyISK/hk/tpEvtR5/ eF7t0vp8tMSD54eybkINr+clScIJ2CZP32kGrPV8WDKn1C3F2hocgYS X-Mailer: b4 0.12.3 Message-ID: <20230918-strncpy-drivers-accessibility-speakup-kobjects-c-v2-1-d5b1976c5dbf@google.com> Subject: [PATCH v2] accessibility: speakup: refactor deprecated strncpy From: Justin Stitt To: William Hubbs , Chris Brannon , Kirk Reiser , Samuel Thibault Cc: speakup@linux-speakup.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt , Kees Cook X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Sun, 17 Sep 2023 22:32:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777360916136443446 X-GMAIL-MSGID: 1777360916136443446 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. Let's refactor this function to just use synth_write(). Link: 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 Suggested-by: Kees Cook Reviewed-by: Kees Cook Tested-by: Samuel Thibault --- Changes from v1 -> v2: - refactor synth_direct_store (thanks Kees) - rebase onto 3669558bdf354cd352be955ef2764cde6a9bf5ec - Link to v1: https://lore.kernel.org/all/20230824-strncpy-drivers-accessibility-speakup-kobjects-c-v1-1-3a1ef1221e90@google.com/ --- drivers/accessibility/speakup/kobjects.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230824-strncpy-drivers-accessibility-speakup-kobjects-c-4009e7df0936 Best regards, -- Justin Stitt diff --git a/drivers/accessibility/speakup/kobjects.c b/drivers/accessibility/speakup/kobjects.c index a7522d409802..0dfdb6608e02 100644 --- a/drivers/accessibility/speakup/kobjects.c +++ b/drivers/accessibility/speakup/kobjects.c @@ -413,27 +413,24 @@ static ssize_t synth_direct_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) { - u_char tmp[256]; - int len; - int bytes; - const char *ptr = buf; + char *unescaped; unsigned long flags; if (!synth) return -EPERM; - len = strlen(buf); + unescaped = kstrdup(buf, GFP_KERNEL); + if (!unescaped) + return -ENOMEM; + + string_unescape_any_inplace(unescaped); + spin_lock_irqsave(&speakup_info.spinlock, flags); - while (len > 0) { - bytes = min_t(size_t, len, 250); - strncpy(tmp, ptr, bytes); - tmp[bytes] = '\0'; - string_unescape_any_inplace(tmp); - synth_printf("%s", tmp); - ptr += bytes; - len -= bytes; - } + synth_write(unescaped, strlen(unescaped)); spin_unlock_irqrestore(&speakup_info.spinlock, flags); + + kfree(unescaped); + return count; }