From nobody Tue Sep 12 16:44:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlTv23s8dz4stbP; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlTv2352Nz3dpM; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=luOmTfveNIfgi7zLnzl7yrKVv7AH8hrBZ05hpQBLpPg=; b=ol4gjBNLKE2CGhYagzEgF/fD01nmYqnkJwCYx4dc5aZjijHIPGRJ2Ip5UiEjIsbNnwugAM 2wNUDi8ztm4FBJ5fJNFWTGkmbh3ai6ZWTzTjT+xDqvk5oBWys2wm0hG1JOXEcWTpfhzFyT 56WKkRYpV2nMuYzs8FhK6aEmXXWOLJsBxg2l5nrIffKRmfWhoF0bODN+2CyjvaPxQyMS2r 5Ifg5sNcIyQY+gkZxsZYWO4y1hjTIEpJqJZHeMDldtKbNXEicMKmMeUY1HkqR80uh0X5C4 d/gr7WZgh92rkMh2iN3tDrcvOTuIGm1LJiDxHrMBVPVNRrlqJ8XZoLUD8vxjIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537054; a=rsa-sha256; cv=none; b=eE73MASnUD7stiGHtxbfIiE3pPslmtFHfcnMoInadn6bUFKIZnxMm0qXXbbZnKdG17A4Vq 3fUm5NQqYmkfaORzoYc2iNG3YZ2JsDspP13DfaXAXhIViAvNEFqAY3T99KthoMcgURPDyq tF7pMgPuUNurpEp+Ffsnk+Z6YjwwtLga1N/9ajcaKnzK9dSiL860OQFvqDeUi2pYdZJmRB IMXNK9sJNuvelbCupfp4a8jFaVMwimCeLIeOv4O324AfmANz4BeRmsfDSnI+LFxJcWAczM 6g8FRCseiEAXdJ3dETOpFp6y4K74ezKZtXnaj5JfPkT4nexgFrASNQ12uhRAYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=luOmTfveNIfgi7zLnzl7yrKVv7AH8hrBZ05hpQBLpPg=; b=i0Ny3X5w7jT2xAjEnNRVwLciqQt90PL1632tGvV0iWG6u0kOEWxzthRUugNEkE/HkD+rLT 8WdAw/e9YFlliPYlPQGxVR8BZeH86vFjHv19PBmfq4uvk+sUzogoKOd8SPMrXamO3t6Gu5 TP7lKMBzZq2Sg2tShCNdC031yHiIxIcOUhsM0podryafOs7HSwgxNsQsDF34vbcZOnU2Dr wEHcjFCr3AXhet6/b/rlJOQQTd1GW36UkRVqNJTvdIoJWaENMYhKPDJOhSlugylb8+k9j7 8rL9mtfJ2tOkujOTsThQFplRisaqBmtPdXEqAWbCO8v3SqAV7QyeGXKOP98kIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlTv21qXBzfjl; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGiEvB071157; Tue, 12 Sep 2023 16:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiEOG071154; Tue, 12 Sep 2023 16:44:14 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:14 GMT Message-Id: <202309121644.38CGiEOG071154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 83660158953a - releng/14.0 - linux(4): Fix listxattr for the case when the size is 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 83660158953abcaa5382e35fbd1bdd75a7ccae36 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=83660158953abcaa5382e35fbd1bdd75a7ccae36 commit 83660158953abcaa5382e35fbd1bdd75a7ccae36 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:59 +0000 linux(4): Fix listxattr for the case when the size is 0 If size is specified as zero, these calls return the current size of the list of extended attribute names (and leave list unchanged). Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit 18d1c86788f66f42c4e096142f4f8d168f68732c) (cherry picked from commit 53b3e15d732ff6ff0df7870107d45a371a376e73) --- sys/compat/linux/linux_xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 74b47f1cbaec..71d7ae58439e 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -173,24 +173,28 @@ listxattr(struct thread *td, struct listxattr_args *args) while (rs > 0) { keylen = (unsigned char)key[0]; pairlen = prefixlen + 1 + keylen + 1; - if (cnt + pairlen > LINUX_XATTR_LIST_MAX) { + cnt += pairlen; + if (cnt > LINUX_XATTR_LIST_MAX) { error = E2BIG; break; } - if ((args->list != NULL && cnt > args->size) || + /* + * If size is specified as zero, return the current size + * of the list of extended attribute names. + */ + if ((args->size > 0 && cnt > args->size) || pairlen >= sizeof(attrname)) { error = ERANGE; break; } ++key; - if (args->list != NULL) { + if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); error = copyout(attrname, args->list, pairlen); if (error != 0) break; args->list += pairlen; } - cnt += pairlen; key += keylen; rs -= (keylen + 1); }