From patchwork Sun Feb 18 21:16:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 202881 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp955407dyc; Sun, 18 Feb 2024 13:18:30 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUaRjeHTo01hZFOydK+vBB6GQm5776mXqiUOb6OIYhw1heHg4sAQi6v/9cQfCYbtxjhTeexJwdTSap89NhpQAnw7bZbWw== X-Google-Smtp-Source: AGHT+IHgLlVmJTPvSLTq18MdHFKmjy4LsPTZzDZZNjAK+9Ov2kVg6yaLEL/PgzwLO2dn2BObNzmg X-Received: by 2002:a05:622a:2698:b0:42d:d502:5ad3 with SMTP id kd24-20020a05622a269800b0042dd5025ad3mr9089934qtb.1.1708291110735; Sun, 18 Feb 2024 13:18:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708291110; cv=pass; d=google.com; s=arc-20160816; b=WhLO+BvmY65AaMELhLVjf35L8y1hkypAoYIiIuBshbMFFdrBU84ncnL1kSsF7WAeXe qnUTHdBadQsSavF/IxlHp5SzpG4hirbENW95onzNUNIp3OyDyShOrVRas7U/5ymbqDUr mWmx6hbLcpIpIWjcY2mxDH07IcsZ40ObZLE/WePlLISdxwVUqAuukkZ8cG3IjAz14QZ2 TWjD89zUJs3C73B/+UemQuqRIzqbaF7KtxXoGT2Ljgr0LPvZrfwmHRJ0DF7dfKwQytAC eyVs8SJ4wCCIUPazomRR4LrZrF/0NOW/1vI2abyxtVeabeYBpn0QlNH2axERtTRlGOJ4 v8kA== 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=ncaSDgs1+enPP4UVmeGBwEY2+QQ+tg5QlYg91NhYxGo=; fh=r6ZWX0mV32UuYNrDh+Pd5jvUD5D7aQAddw76RYyw3/Y=; b=dcue2g30Q5bH5Pu5gxlEKJzFdFRlGgwku0onawDMjknIy6866k0d/PVJmQULZ/+BfS 1h7KQHqjrMlyFEdt+EmArLnA2Z5nmvpvfoguur0eJgmjgk6TgetAGzA4KoCRxibU8bAm /oQ3uftcvFP8v3QeIIxYsCZfxLyZ252UumwqmgKdOw38qEhwAhu8XIgEPSWFrA2L+7v/ EDVAA21nrfwgTpQC7SFnk+E0PwhAziobH/KQCkf16jav0AV7iPJV3marGEgTlVud1Tno 2yu1MaCtYEynncwzlNNmUVd7VVzS3cm5S9yA1tzC776ZtoIZIMCWW6xSEw1Se3KgGoXP bLVg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=TVTh33e5; arc=pass (i=1 spf=pass spfdomain=wanadoo.fr dkim=pass dkdomain=wanadoo.fr dmarc=pass fromdomain=wanadoo.fr); spf=pass (google.com: domain of linux-kernel+bounces-70588-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70588-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id t17-20020ac87611000000b0042df55ba7ebsi3803726qtq.671.2024.02.18.13.18.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 13:18:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-70588-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=TVTh33e5; arc=pass (i=1 spf=pass spfdomain=wanadoo.fr dkim=pass dkdomain=wanadoo.fr dmarc=pass fromdomain=wanadoo.fr); spf=pass (google.com: domain of linux-kernel+bounces-70588-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70588-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=wanadoo.fr 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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 6F48F1C20BD8 for ; Sun, 18 Feb 2024 21:18:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AF049745C1; Sun, 18 Feb 2024 21:18:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="TVTh33e5" Received: from smtp.smtpout.orange.fr (smtp-24.smtpout.orange.fr [80.12.242.24]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A43D2E3F2 for ; Sun, 18 Feb 2024 21:18:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.12.242.24 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708291090; cv=none; b=NyIYVuwSOKZtTsClDdx34xpGAyRN5ywep99c/x8uARCE36xP/8L4CgWwcOkHEwXUFDhf1/1ZQKjmOMSreOiXrt6osV8mG5rl2KhEAShlD6xUAI6chVHROvo+CDbGajAh1iJXLFmKhqlTaK0w77qUpoMYDyBjihc3M2bm+VgS0UA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708291090; c=relaxed/simple; bh=BxcqsSOye6RaQDfKIvGr2bgaquYxTiPvYyIpjcx/QPk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KPFaw3vKCZYeVvRyo/VsWtIYxWS6mLuYlpP/MYPGTQWrG0SUTPig7M59wNEyHuwSn9F5rusweQQleaUDr3hBSRDUOLJTeftTptzyq7Slv8OGeOoH1nfYw1C6eIqSGqV8jR3iBHjholCMtU2uSoKHsIbO8X8+Q0XwnyGWDLyrxEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr; spf=pass smtp.mailfrom=wanadoo.fr; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b=TVTh33e5; arc=none smtp.client-ip=80.12.242.24 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from fedora.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id boWurGUjG3aavboWur7NMi; Sun, 18 Feb 2024 22:16:58 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1708291018; bh=ncaSDgs1+enPP4UVmeGBwEY2+QQ+tg5QlYg91NhYxGo=; h=From:To:Cc:Subject:Date; b=TVTh33e5zGD+jTgYlXCXIyyKR0D1mAhWmmyu6zt6Innsy7t2jdchKNdz6ImEfAN4R hIBlfXwDCuvS/ArMcl8M0zPB14z3VgJli6Zhu+30RHRqAfwA0YpuCHIR8mlzBBsfbq oUnvoxE51so0miM5RYzMSVGFpFtGmHfxiNZIIx3HpplsyQ8Aew17aGD8VDllEY+8zV HD0tPZ29As9evqkTJDE9FgKZFO9F32nLmzYanz2D12zmhYFu7AXwyNYQA/IGwyymnY cXfWvV2O2bjvrnQK7tnb/Xv5FZ1lAGo+DR3xcDlORd3+mkD24xA0pyazx0drXdS+qp OmPrZuDsZrzOA== X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 18 Feb 2024 22:16:58 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: bcodding@redhat.com, Trond Myklebust , Anna Schumaker , Chuck Lever Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , Trond Myklebust , linux-nfs@vger.kernel.org Subject: [PATCH v2] NFS: Fix an off by one in root_nfs_cat() Date: Sun, 18 Feb 2024 22:16:53 +0100 Message-ID: X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791273059761479396 X-GMAIL-MSGID: 1791273059761479396 The intent is to check if 'dest' is truncated or not. So, >= should be used instead of >, because strlcat() returns the length of 'dest' and 'src' excluding the trailing NULL. Fixes: 56463e50d1fc ("NFS: Use super.c for NFSROOT mount option parsing") Signed-off-by: Christophe JAILLET Reviewed-by: Benjamin Coddington --- v2: - Fix a typo in the commit message [Benjamin Coddington] - Add R-b tag v1: https://lore.kernel.org/all/856a652a7e28dde246b00025da7d4115978ae75f.1698184400.git.christophe.jaillet@wanadoo.fr/ --- fs/nfs/nfsroot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index 7600100ba26f..432612d22437 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -175,10 +175,10 @@ static int __init root_nfs_cat(char *dest, const char *src, size_t len = strlen(dest); if (len && dest[len - 1] != ',') - if (strlcat(dest, ",", destlen) > destlen) + if (strlcat(dest, ",", destlen) >= destlen) return -1; - if (strlcat(dest, src, destlen) > destlen) + if (strlcat(dest, src, destlen) >= destlen) return -1; return 0; }