From patchwork Thu Aug 3 21:33:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 130878 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1449933vqx; Thu, 3 Aug 2023 15:53:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlGR7htArGOF8PH6YIOVTcn6KyI/Q1zIImiad+tYVVWm8mG+D5bljCIGd9nvkg6tUNjVBPfn X-Received: by 2002:a05:6a00:1951:b0:668:834d:4bd with SMTP id s17-20020a056a00195100b00668834d04bdmr18420393pfk.0.1691103194099; Thu, 03 Aug 2023 15:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691103194; cv=none; d=google.com; s=arc-20160816; b=XWCOmrp20XJhjJ98qRg6u0C3KR5aH2UZ5kpNSK9TQ1pss2zO3kfd+wS9+wbe7zmW1I BkHm/Wi2MBvtuNgPf9gZKE5hTnHqCY0gWkhn5N2K8nav1UjyqL5GL2Qo5b5pL+O99c/k +/5gdzlPr/aSiX10KEve/DSpX6M2hJ5u7yvtEKOyAZMJ9PIjtALEd72ebTHovV8ISOrD v3QTvxRbcJ1XKpOglYk73lKT+IbhYytZldsCxt2WZXFQkwGLwWO8JMVvZOg9aLmj7tqh s32FNwidG6wUwDBdGEBBpFkdlEmg1Y9gPj1eum2ge8SLKJB7Wb2Rr2RSAdvTnDWLeAHm mPkA== 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=9a1CX278YGq0zGZWP+f0LaA5pxcSpZKfqzUpq5J0Xvg=; fh=t92g5IBhEjoP6khrC5R0YpQpTY8bxvbdAi91vQvUQCk=; b=BAQMB2kjqAGytWKJAdIrfXJ/HroHZH7Cxao7j3zkUS08VPfWmcubpjhmBWkSUvChrV EOmy5ZzTreozol9WM59hvd+g0sZvzPeNiAezvZ4CSZi1dLoYqtKMKnq2zAwgR3pirYSu rWVeL825GHklQL6CcZBQfIwj/37AOPEVOR5oLMgudunfB6FV2B/ibBRtVog2v8rPjfy7 V+pFbZ/+nkWS6QlonQ/CFXQxOq3nrjzNyzQKicbY97t3vx9zHkxh1uY5hDcucVtL+TFx 53zv0mvww7uSduzUOz63+ogVWCtD9ATPUiRdc2ryHpzrjGpMV7Iic9jLhDoLmo2x+S5a uSOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=IR5xzMKe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h19-20020a056a00231300b0066e96a581c8si687462pfh.261.2023.08.03.15.53.00; Thu, 03 Aug 2023 15:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=IR5xzMKe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230018AbjHCVdz (ORCPT + 99 others); Thu, 3 Aug 2023 17:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231839AbjHCVdx (ORCPT ); Thu, 3 Aug 2023 17:33:53 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CFE93581 for ; Thu, 3 Aug 2023 14:33:52 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d087ffcc43cso1488510276.3 for ; Thu, 03 Aug 2023 14:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691098431; x=1691703231; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=9a1CX278YGq0zGZWP+f0LaA5pxcSpZKfqzUpq5J0Xvg=; b=IR5xzMKe8szTmxl4p2ho1ObEqwy8naF4E4qnmDtBq7lAxEtsU16tQj/R4R5qESegez PkrsM289xscbVMOJUdfqB4yLgjio6Z6UyTQ5akbsqRMVo/0CI6G846MYZvRY5SnSnkmz tLPxmo4niw2nNfzxnBiONXV83evUYWw26lriJf75L9atmgvwAuNI5FQTSgUw4k4iWQrK UI9t5ZYCmE3/x2kIcQyQMLaEOC8LoQHmUO9+YULFdo01f+mC99FiBoEx3M4fWkTeeb98 lRZqa6RGf+ZJ9wu3iOqQHRY2Gzg59Ca7BS8kxvbQPHU1PAbEiHR33FOvMQ5ucfGAtJAx QPfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691098431; x=1691703231; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=9a1CX278YGq0zGZWP+f0LaA5pxcSpZKfqzUpq5J0Xvg=; b=LMfUuwzFbO4RpO1QImf4aQOJ205OLjGBZ0BlM3UH7rIn2l5czgJ+tP2bDKY6FLPxMW 39EgO52ancCIcHRTUbQjzmLH1I2WAqZXEc/6hv6wSTgWRQtiT7mmnwvQOnzZ9c/bGDH4 BhBVesCh8b2S1MsT0k0ipF8NfiNk+HM8Wty1C4PjPTDxOUnEw1M+zRuD4m0d1UR6Dugo C/4yDLMcPDGEB1jFH2FDaOgQdZRfa279pKQDopld/D2f4+GNWxxNhlp1IkobNiDZw4aq oFBp+YEJxmVM+PMEJHmXOezPM6fa9sNI6IDEPSMAVPSruxcWaOI/Uk2QiAUMNQEIRzCp w2/A== X-Gm-Message-State: ABy/qLZg46EYG+L77MJOLsraR4qJ8+pQbsVK+giElkZ4BbYE8ad8lEOZ DAWKIjcikMBDCpaNrWSxDOie0qFf0aqn+ZQuwg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:d24d:0:b0:d08:ea77:52d4 with SMTP id j74-20020a25d24d000000b00d08ea7752d4mr138360ybg.12.1691098431718; Thu, 03 Aug 2023 14:33:51 -0700 (PDT) Date: Thu, 03 Aug 2023 21:33:44 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIADcdzGQC/x3MQQqAIBBA0avIrBNMsaKrRAvJsWaRhlok0d2Tl m/x/wMJI2GCkT0Q8aJEwVe0DYNlM35FTrYapJBKDELxhMsZKReewx5K4L3Vg9PKKm06qNUR0dH 9H6f5fT/e0nA8YQAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691098430; l=1987; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=2evVcZK0WP6ax5yAm7AbIZ6ZeQaKrhdt6vD9tIcclH0=; b=ypFgRW0czPyi/GHwpauG42Y9gan08GzQKInJtaElHrzDHwEl74ITApi9Gu8Ptkoi/fv6MXJxT Z/witMGLrcwALUkSIWGhNs1KlNn/ZXVqD3fHBSWZbY0yYDhlgIV5Rxe X-Mailer: b4 0.12.3 Message-ID: <20230803-security-tomoyo-v1-1-c53a17908d2f@google.com> Subject: [PATCH] tomoyo: refactor deprecated strncpy From: Justin Stitt To: Kentaro Takeda , Tetsuo Handa , Paul Moore , James Morris , "Serge E. Hallyn" Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , linux-hardening@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773250222570067931 X-GMAIL-MSGID: 1773250222570067931 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. A suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on its destination buffer argument which is _not_ the case for `strncpy`! It should be noted that the destination buffer is zero-initialized and had a max length of `sizeof(dest) - 1`. There is likely _not_ a bug present in the current implementation. However, by switching to `strscpy` we get the benefit of no longer needing the `- 1`'s from the string copy invocations on top of `strscpy` being a safer interface all together. [1]: www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [2]: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt Reviewed-by: Kees Cook --- security/tomoyo/domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- base-commit: 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 change-id: 20230803-security-tomoyo-7d58f53d35a6 Best regards, -- Justin Stitt diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index ac20c0bdff9d..90b53500a236 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c @@ -784,13 +784,12 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm) if (!strcmp(domainname, "parent")) { char *cp; - strncpy(ee->tmp, old_domain->domainname->name, - TOMOYO_EXEC_TMPSIZE - 1); + strscpy(ee->tmp, old_domain->domainname->name, TOMOYO_EXEC_TMPSIZE); cp = strrchr(ee->tmp, ' '); if (cp) *cp = '\0'; } else if (*domainname == '<') - strncpy(ee->tmp, domainname, TOMOYO_EXEC_TMPSIZE - 1); + strscpy(ee->tmp, domainname, TOMOYO_EXEC_TMPSIZE); else snprintf(ee->tmp, TOMOYO_EXEC_TMPSIZE - 1, "%s %s", old_domain->domainname->name, domainname);