From nobody Thu Jun 29 08:20:27 2023 X-Original-To: dev-commits-src-branches@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 4QsBGN1065z4knrb; Thu, 29 Jun 2023 08:20:28 +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 4QsBGM72Rgz3v2F; Thu, 29 Jun 2023 08:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026828; 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=ugwlVQzoDUSDvsPqiqRezu2GDzi92kG6STA1pHauaF8=; b=M0Bbxm0/JJdHSXAAMBJkMwzMBJrdevDpLdaASNH8SQUvgpWqA27yPsAI1hGMEKGdk8OUZX K5pg4JgExCILlLHANYAUXJWH14fFJVB8soaaVoKvZrR7DOhTCJ4jHfHlAox+iRAIf/blcS qg9494FMkoZ4DAWAfQlSUg1ezsswcNTZZ685ouo8xbAqkN00tuHQijIo8pm57S30KVy6i0 kLEWMoM0D83GxDUvUiQU/y7iGd3dCEZmYrTeIiw6okdRT2nrW4zb6z3M87yU5qQPqZintb xVWVziiasfcE/OUiQDos9gA4OY5mnJ/amneQAZSICn2QFzYP9ZswhTKCKl6Gug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026828; 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=ugwlVQzoDUSDvsPqiqRezu2GDzi92kG6STA1pHauaF8=; b=HIqUceMllaSlsX3whQQcnOxhzLshMuYmoyAsDWJH1ID/aCQHSjgbpum3FQmcjUOruFKW3N 7jAQPt3iaPg+ejQZMuPW1+6FsBX152i57ChH29RpYlzceJM4HpFyBZmeeykpig+7na99ak R1RXpUBaVODGmiHauOAv1o76aznj0HNdBD2iMe8tSgQ23mX9gJTt5b4NI05xJlLvszvS8f 4JSWnJnlmk1eZ6+ABmSJ9CFB00jcQiB2TVPsgPs7NiEMbm7FTNZ/0fCFHOfDmRrF4QTUhy nCBMq69oYh6tVpFNMjk6wtVpJ2dKvljmNcqQPMI+ehmOB+i3PLLnQcJzSR+6vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026828; a=rsa-sha256; cv=none; b=TOO6oImA5R6krKRm2MdvKnjqBwNuXj4bp780FxRvGoXvobugXvsH5Ks4iFym+xtEVwfRtQ GVfegVQUAyDVlTQcDg2I73GJwqTQ82BeznL0w7oZK73ruzxHXdDtSZ86Kj+l2x1nR4dcEe tZR1dKcovBGiE1DcbuTJPvM1ROOJzFJ1BJlnhJMlD+/qGZFheYu9rfaNA94HX6QrI+FgkJ XwnZR/DDSzmQTrk3eD72VlYjIMuQCRkexCs98wlKyob7GSTnIaj2yhOPM3k5rzjl2j1mAe Lxogp0X6YR8He9U9kd0NWo8pV7uu0Q4c9abFkTI6ZyydUcFB2W6D7aBEEqABSg== 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 4QsBGM65drz182y; Thu, 29 Jun 2023 08:20:27 +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 35T8KR0E083474; Thu, 29 Jun 2023 08:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KRgC083473; Thu, 29 Jun 2023 08:20:27 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:27 GMT Message-Id: <202306290820.35T8KRgC083473@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: b971d6aec115 - stable/13 - linux(4): Add a dedicated fstat() implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b971d6aec11597dfdad36a53680c869062b7ba64 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b971d6aec11597dfdad36a53680c869062b7ba64 commit b971d6aec11597dfdad36a53680c869062b7ba64 Author: Dmitry Chagin AuthorDate: 2023-06-29 08:15:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:49 +0000 linux(4): Add a dedicated fstat() implementation In between kern_fstat() and translate_fd_major_minor(), another process having the same filedesc could modify or close fd. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D39763 (cherry picked from commit 994ed958ae0545faa86dd43b6e64bf7b64b9220b) --- sys/compat/linux/linux_stats.c | 75 +++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 44 deletions(-) diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 934fc6e5e740..07ef72706d75 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$"); #include #endif +#include + #ifdef COMPAT_LINUX32 #include #include @@ -59,6 +61,32 @@ __FBSDID("$FreeBSD$"); #include +static int +linux_kern_fstat(struct thread *td, int fd, struct stat *sbp) +{ + struct vnode *vp; + struct file *fp; + int error; + + AUDIT_ARG_FD(fd); + + error = fget(td, fd, &cap_fstat_rights, &fp); + if (__predict_false(error != 0)) + return (error); + + AUDIT_ARG_FILE(td->td_proc, fp); + + error = fo_stat(fp, sbp, td->td_ucred, td); + if (error == 0 && (vp = fp->f_vnode) != NULL) + translate_vnhook_major_minor(vp, sbp); + fdrop(fp, td); +#ifdef KTRACE + if (KTRPOINT(td, KTR_STRUCT)) + ktrstat_error(sbp, error); +#endif + return (error); +} + static int linux_kern_statat(struct thread *td, int flag, int fd, const char *path, enum uio_seg pathseg, struct stat *sbp) @@ -77,7 +105,7 @@ linux_kern_statat(struct thread *td, int flag, int fd, const char *path, if ((error = namei(&nd)) != 0) { if (error == ENOTDIR && (nd.ni_resflags & NIRES_EMPTYPATH) != 0) - error = kern_fstat(td, fd, sbp); + error = linux_kern_fstat(td, fd, sbp); return (error); } error = VOP_STAT(nd.ni_vp, sbp, td->td_ucred, NOCRED, td); @@ -111,45 +139,6 @@ linux_kern_lstat(struct thread *td, const char *path, enum uio_seg pathseg, } #endif -static void -translate_fd_major_minor(struct thread *td, int fd, struct stat *buf) -{ - struct file *fp; - struct vnode *vp; - struct mount *mp; - int major, minor; - - /* - * No capability rights required here. - */ - if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) || - fget(td, fd, &cap_no_rights, &fp) != 0) - return; - vp = fp->f_vnode; - if (vp != NULL && vn_isdisk(vp)) { - buf->st_mode &= ~S_IFMT; - buf->st_mode |= S_IFBLK; - } - if (vp != NULL && rootdevmp != NULL) { - mp = vp->v_mount; - __compiler_membar(); - if (mp != NULL && mp->mnt_vfc == rootdevmp->mnt_vfc) - buf->st_dev = rootdevmp->mnt_stat.f_fsid.val[0]; - } - if (linux_vn_get_major_minor(vp, &major, &minor) == 0) { - buf->st_rdev = (major << 8 | minor); - } else if (fp->f_type == DTYPE_PTS) { - struct tty *tp = fp->f_data; - - /* Convert the numbers for the slave device. */ - if (linux_driver_get_major_minor(devtoname(tp->t_dev), - &major, &minor) == 0) { - buf->st_rdev = (major << 8 | minor); - } - } - fdrop(fp, td); -} - /* * l_dev_t has the same encoding as dev_t in the latter's low 16 bits, so * truncation of a dev_t to 16 bits gives the same result as unpacking @@ -242,8 +231,7 @@ linux_newfstat(struct thread *td, struct linux_newfstat_args *args) struct stat buf; int error; - error = kern_fstat(td, args->fd, &buf); - translate_fd_major_minor(td, args->fd, &buf); + error = linux_kern_fstat(td, args->fd, &buf); if (!error) error = newstat_copyout(&buf, args->buf); @@ -634,8 +622,7 @@ linux_fstat64(struct thread *td, struct linux_fstat64_args *args) struct stat buf; int error; - error = kern_fstat(td, args->fd, &buf); - translate_fd_major_minor(td, args->fd, &buf); + error = linux_kern_fstat(td, args->fd, &buf); if (!error) error = stat64_copyout(&buf, args->statbuf);