From nobody Tue Sep 5 08:53:53 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 4RfznY41Zdz4sJ9d; Tue, 5 Sep 2023 08:53:53 +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 4RfznY2mTYz3KtK; Tue, 5 Sep 2023 08:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904033; 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=e10hmVBwvGRKYSMfMmeX9TfcMd51j6rdL4OXG120Ra4=; b=w/HewTQHNf2lzWSTGXbBIrVz4jWwB2rb66aeX1EnOsrERywNfmLNdh3HyKkYjLjzmrzgXz qf9IHa8jI7WgGjpbMXK6Ypo1UJPMDqNubEAPn4Xme5MsLWzMQ2Ng2XdCg14qiW7CZx298m lCvYrTLaNy6b+tddm6Q+NYNY5eGMeQPyTqQPZj4LsRl4w3SzsAJK+YpuwIHyfJt0Zg+sgP L13aOSm2lKbnbfK+XpS2Dfe+HntV73GCFRMXyzN6+IXi7OWMouqOwQT0Twl41srEmklp1J aH2JM3mbVqj2dKtsy4ZInz9g7uVWaLshTyM2X/WMqRLOJ2e8bpyjYn6GbtereA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693904033; a=rsa-sha256; cv=none; b=tT+gB7061CFcTdkVNSes1Whv8BKOrPacY15gfBwk2xgBz7C3V/r5v/CmzvlkYgiKFEsV+2 Z61C3pzGuCfbt+HBWgnLObQgyMLePNMYL9CEe65G3hsbJSizXvimjnCTd9Yb3Xl+x0G9mB KlNu3g1u5rUHR4gcm452yy1f7hUMRTy0qd5YSVPBtUvjWES2kN+V6PjsN6iaJsMixrM7Xz JBOCUK9ggJD1kuRmTROnAWaLG+ltyav9pGKzzrFilwh3kxCWsOWTN/CJ1ij+ncnyudcCPv GhVu1Qh7Ar8zd5DXL4nzalrVz6/L+dUuSL/eIBmQYb3SOEIRpqrOh/Lz1LpYAQ== 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=1693904033; 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=e10hmVBwvGRKYSMfMmeX9TfcMd51j6rdL4OXG120Ra4=; b=ZoQALh4AJ675tRIdETcyINoiqre9idA4T5k1A5NT/R16OZpv4ouZm3kB9nSGK5guW9suLT emrNF0Cn1iMV28zjsjVLWsYagVDs5U5EcMZEW3SR1pxbdmsji5G7mNE2LCyOBYo6vPzg/P 20UsOi5SUAymaaBW0G4osi++UMqQEPz/8nCXMeLy4m8WpWO00bywZ/lTQeIwvytdzQ+UCL TAEesMZwwSFqayycXbuIMxJfECu+7kj6mA9fsL2diJy1DgQnr3s732/uJEr6d5nkUP6eVK ZbmZxKQg5mRISYTvzwo41SkADL7cX+pPv/OfKpjmkZw+WwaGZwrCdAOCSQL/Yg== 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 4RfznY1qYJzC0P; Tue, 5 Sep 2023 08:53:53 +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 3858rrSG030610; Tue, 5 Sep 2023 08:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3858rrjq030607; Tue, 5 Sep 2023 08:53:53 GMT (envelope-from git) Date: Tue, 5 Sep 2023 08:53:53 GMT Message-Id: <202309050853.3858rrjq030607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 18d1c86788f6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 18d1c86788f66f42c4e096142f4f8d168f68732c Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=18d1c86788f66f42c4e096142f4f8d168f68732c commit 18d1c86788f66f42c4e096142f4f8d168f68732c Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 08:51:46 +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). Tested by: zirias MFC after: 1 week --- 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); }