From patchwork Mon Feb 5 12:35:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 19932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp843576dyb; Mon, 5 Feb 2024 04:36:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvu1aeiHmZbykqRxyAzVbqBS8KdJJdPB33oxFAWAFsBBPTxCEZlasiHL+ppBLYs4+tZR72 X-Received: by 2002:ac2:5e79:0:b0:511:3a20:e116 with SMTP id a25-20020ac25e79000000b005113a20e116mr5176091lfr.11.1707136610146; Mon, 05 Feb 2024 04:36:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707136610; cv=pass; d=google.com; s=arc-20160816; b=tBUeYHwgz8q/ec49XNxMZ6qVLXFSJp5fdxR3ZgCYrsPFcy79QIG/SHVmE4hJCP6MSI EKFPIgxoVTYzCxgZ0gdyoI0bLWsgLYzyiTsHC561WMtRTsBCkv1BCKKrK8jwpfx8v6LW uFQSRk90Poz0hgdXZwqQdOpL7/TZcDnoGFfQoleO8z0XxuRFa6DkCGQ/mQMwuo8CU+8H 5iSq44U5Tdm10qqJI4IHqluxx5Tn9WcugHOt1n1yu6zOh+1cRfoCsue/rT47pF+wltr5 4FkK/ZdyY8AFJJLHStMuXbvwr6AqdvKnr7PSj+akAjjYy8kkHraGTVHY+KiHQV/6qpLM Shxg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=LXCtrdF00SQKGnbl+QKIcgctTVGI/MnfqCbM8VG+D4A=; fh=NNpiZVBPH67RObGzVgE8j7FpbnUXPkNg4EU5n+fA/eM=; b=CbOduoSDuSmPgAxBX+rJ+z/HQup3gIZFa2mWaSkfhZvuHYG08JL2X8ldbTC061bRwd GdsjbTVZcG9I2sXIuVm5T2op/ZYA+UCEid6AdShhqlCpbUiFqaXVQALjIq/8a0/99Emt XqUGwV7hvCA18v5Cflb4dANewvY/rFPVRfHqTQeQItdi+tr9uQpCAjjM+q9YghiwJWPJ Vbl7Qux0yVjwaQkRba+6a8k9QGZvWLg5/5jyS78YucEV/hzNL/VDjz89Tw6TNUy9n8oW cJhR9FYtKNeJxN/bKOeI05Wis01ohR1ZbyaTV6U9BNTXLKhKIJCBTiirYtKMEdRqsiwi X84A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=m1VeL4dD; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-52613-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52613-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org X-Forwarded-Encrypted: i=1; AJvYcCX4ZH+6xfER1Y3Vc2PSDx4+c9D7fFbfNuM33cNOHgUntNSxwggXKTYCyRaZxU1XxnmOfHoSQpUz8tVSJSHz7piMcPQX8Q== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id j13-20020a170906410d00b00a3686d83117si4005173ejk.525.2024.02.05.04.36.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 04:36:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52613-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=m1VeL4dD; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-52613-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52613-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 9078B1F20F71 for ; Mon, 5 Feb 2024 12:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BC7F61CA96; Mon, 5 Feb 2024 12:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="m1VeL4dD" Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E768D1C2BD for ; Mon, 5 Feb 2024 12:35:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707136528; cv=none; b=RgQTX/cMsOLZ24fY5HQ1H6p3DQYqALzZtj94rg9n/Z+K0KRaHICLsob6LAd6Ha+iyQWNACnuVRdOwcKUnnJWByIv7gpuHTouI9nNykaZC4vtrPpv04gcDTGWQjGOkC6Z/n0tix+zLnocEPIyl4bA/QqapXBIqW/mwKsdJhUACqk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707136528; c=relaxed/simple; bh=gb1pMezQom2o69/2/S4q14GG7K9g4wEflN/V7WqIjPU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=HuPdudrfdarmUwMwgHZ2gAglVY8cnkNavxrEcSBghho/C6xPLoFOJqWiTTh/muBw1hdZtyf6UF27XKKqDmAUFAkR9QhDo29g+uZl2apaluR6gCrMMHJxin0IQJioDbuzSs1WaTG36Y7brKuAU/f/1XklR390iED/FuZ+DeD3i6o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=m1VeL4dD; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d8ef977f1eso32090705ad.0 for ; Mon, 05 Feb 2024 04:35:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707136526; x=1707741326; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LXCtrdF00SQKGnbl+QKIcgctTVGI/MnfqCbM8VG+D4A=; b=m1VeL4dDsfe7kqhwDS11YhF+4oWfrnRisdS5mUvKcaKlCN2umoh0AihiEetvCsRC1h 8d0W2wtWqAbTbM4C0Wq4Wa5vmcCFrQH1vyZF7GHGUF2MppbXd6cakNSwHoeG8JyKs5Ij 5kTlr7mEwsIc7XC88OpU7nwAbL+LjxxRdniT4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707136526; x=1707741326; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LXCtrdF00SQKGnbl+QKIcgctTVGI/MnfqCbM8VG+D4A=; b=dY0sbWc/X3RJSYrTeurIGV1BGEBRVk2EhbHy1JoBA82I31fzv03ZhpnlwO/XlRjxN+ K/zNaT3oAISxvpNGTIfEZZhQqc4Fu8y98ydM4D7OmmWcSbRMePXTCLtFsJQefPPAR34f uC7/YgtA3H25+3o5mHlv+X8Pg6WgROaM7/xVK1sDiAz/r3PeZGCXrOzklfqvpvYLE7Lo XZc+NMlLhx1G06pBtiAJ4LxTDBVcv6E9L4kdDSKr97lecatKtFFh6fp9GD4Gu0hJPkJ8 v3dCB2SJb/gi1rIZhIhFbdH+gH16zvQn/mJbftSDM/+C/0kxpo9MczCH0T3iRxPJbIbc DK2w== X-Gm-Message-State: AOJu0YxjggVuN2/He6t/h9Tf7WJV47XZzzA4IeJow0b9hq3mbTcbqGLJ iFg6syGP5kPMHip6hiB1I3MokfWsooy5L3whmJvDHy0/E7It6kR5PubTtfr7aA== X-Received: by 2002:a17:902:ed89:b0:1d8:8bce:4b47 with SMTP id e9-20020a170902ed8900b001d88bce4b47mr12130224plj.65.1707136526270; Mon, 05 Feb 2024 04:35:26 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXk5p6S6lfRKaUcKLL3y+54YU9665V3vplVUkWabvzhXSGG6cefCsS0fg0GmaAuvX1XpUjHN0kfhO74pge0p5RJOH6hxwrAHz9X2PKrTpFo5TTH2WcFxlRsai/zoG4JJ3e6aCrn+c8NQBf/dMQdjKq+i648dkBnTZBe1kUUcLoWAoMQgNxxiq7XomcNIZKW2JPUSf0hyWoHYURIYZu+o7kzUfF3IviwJXhE3Sfz9Y/vWXSnt1CUkxV8HIcBpnner4Du7lL2Fd3rgKViXbzi8M/K3jtVU2Q5UcGrDMlrouo+HaAv/jY8giE0zk6GIqe602cm+U/C0ciQwGawGSsUPBVd8zzhV+qZT7MkynDg+dqjS9gCuf6p/Vco8lbWLLiqggczSmy8VnxxInCkE9ZL3Fe7ca5qHcWYkc3JM06n8Up3VtI1GYxnUZJkd2Vs3GkmQKXjXTbUPV8YN+obyUZTiDz6 Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id jj14-20020a170903048e00b001d958a17e07sm6251149plb.294.2024.02.05.04.35.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 04:35:25 -0800 (PST) From: Kees Cook To: Andy Shevchenko Cc: Kees Cook , Richard Weinberger , Justin Stitt , Anton Ivanov , Johannes Berg , Willem de Bruijn , Jason Wang , kernel test robot , Nathan Chancellor , Azeem Shaikh , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-um@lists.infradead.org Subject: [PATCH v2 0/4] string: Allow 2-argument strscpy() Date: Mon, 5 Feb 2024 04:35:20 -0800 Message-Id: <20240205122916.it.909-kees@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1408; i=keescook@chromium.org; h=from:subject:message-id; bh=gb1pMezQom2o69/2/S4q14GG7K9g4wEflN/V7WqIjPU=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlwNYLbm8KrEo4o92C5K+vQbxvOEnNcE5pT/0OK FUyaNJ00G2JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZcDWCwAKCRCJcvTf3G3A JqjyD/45HaDlf2xlN86ZwY7uJDXkuQm1bipeu++EsScElkwHpim5eV9GxCdDzgGY8lgbSwOpZrH 7CSbh2sTvX3KmGVqFxTPelq7eCz5QfcvMuorquo0AfoTAv7iMKIJqOvjKT30glEcQQvvkOBx2N6 jPIJ9bJQ909bLSeitjbqDzFmOjNYcjH2jOR5Q4Y064FgXENp54B5UEcsA1RIXsIQG8RHhDPuwRx 06+pU/hUKVuZp0TMIyOG1tvj9WKLqpjWhM5xo15Ww8o4kbJshg4MIYoMAu3/OHHE9Q2Fk/BlejD NRngSmz5BtCPRD01rgMGhUyeOLVmBFyWVmjOYihg8P7uVfL8YM2FDxN7kbIHcgMfvNVkX0gxkHF wEBWOxFsnkXQNn3/yeVIO0mUtY6fB5zeesL2iyth8nO7tLax85EjyPL4WEyijXQVjtnyTEHHqaI CYoIA8g2bzqshurlUj6iUmyOY4qMItiKIbgOkHB0NZiOkfbR6ErWjINDjMFoOIQokSF8JBPGYdC NNh3wlaDHktdGv2lDiPsmYLYpEpa8CmdGA+47gA80iuynBbTZIZuVI0eDGdDd0iqNyqmYXLChwB rbO4NR8AmDHbu64hE2Ejlnjmpdhy14BPmO+U8HYSfMkX9CeiPAq92XuusvpigykrxEDFOHVXbI9 CcEroad bJ+I/gIQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790062477789469083 X-GMAIL-MSGID: 1790062477789469083 Hi, v2: - add strscpy_pad() coverage - fix up ARCH=um to handle the renaming - use __must_be_array() to validate sizeof() usage v1: https://lore.kernel.org/all/20240131055340.work.279-kees@kernel.org/ Make it possible for strscpy() and strscpy_pad() to use 2 arguments, making "sizeof(dst)" be the the default 3rd argument for the destination size. This can make future usage much easier to read. Additionally allows treewide changes to save a bunch of lines: 1177 files changed, 2455 insertions(+), 3026 deletions(-) -Kees Kees Cook (4): string: Redefine strscpy_pad() as a macro string: Allow 2-argument strscpy() string: Allow 2-argument strscpy_pad() um: Convert strscpy() usage to 2-argument style arch/um/drivers/net_kern.c | 2 +- arch/um/drivers/vector_kern.c | 2 +- arch/um/drivers/vector_user.c | 4 +- arch/um/include/shared/user.h | 3 +- arch/um/os-Linux/drivers/ethertap_user.c | 2 +- arch/um/os-Linux/drivers/tuntap_user.c | 2 +- arch/um/os-Linux/umid.c | 6 +- include/linux/fortify-string.h | 22 +------ include/linux/string.h | 75 +++++++++++++++++++++++- lib/string.c | 4 +- lib/string_helpers.c | 34 ----------- 11 files changed, 87 insertions(+), 69 deletions(-)