From nobody Thu Feb 10 13:46:52 2022 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 8BD3A19AD1CC; Thu, 10 Feb 2022 13:46: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 4JvdMc6L9Pz4cvl; Thu, 10 Feb 2022 13:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644500813; 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=Bd6gXem5AAJQ5QH4LV2xVax9CQBtSVeeEmdZaD+7RkE=; b=HlRpuxG6yLWNEfe/PFdeDS6OsLV6DDOd+CKZ9DgF5Pug4Tad/7OjweGFmmfIXBU4TN6Ona 39vCr0QFQwKd7bllU9dIoGmk5+eLYORa5woADN/7VjNUDjFE3deekL4bS/y/vcc+83NGIm bkSI4Gwc1plscmOy6ehOXTAp3NRnorvLNUxJFnjrTzrepn30gf/B6Am3lEd6VTto275oFm lBtSMcQVR5jNxNQOqXE6mEUvcfMq+VWfUFVllqw9No2XQetbiSZ56j5OETWlA9FFOu7vpS ecalUtWJHYP0IZCYKcvHMWeUQueacXomkmtsxuYqkhnsZ4yTskg1nj3usuj8Hg== 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 6CC242192B; Thu, 10 Feb 2022 13:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21ADkqFU049607; Thu, 10 Feb 2022 13:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ADkqbj049606; Thu, 10 Feb 2022 13:46:52 GMT (envelope-from git) Date: Thu, 10 Feb 2022 13:46:52 GMT Message-Id: <202202101346.21ADkqbj049606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 45711ee38a09 - stable/13 - filemon: Reject FILEMON_SET_FD commands when the fd is a kqueue 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 45711ee38a09b8b8083d13b3aeec64fa2e3d075e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644500813; 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=Bd6gXem5AAJQ5QH4LV2xVax9CQBtSVeeEmdZaD+7RkE=; b=Hna1sJWlfTcI7Wb41UDn44IzDvKbzWOon6VyHgqLiyPkSUfFEb8CYvfABJY1+8IDaguENh VDpmPTgWEGxB/pVRKS7EPMGn65oaVThahRTv+G4HIueqz4ajTzh4dgwOn/3Q337YrFXfLd BuEy36F9JDnVU929zTV4oW+yfP7Ua+bk8ZW7GJn07UmG1v4NDMCkDFJPqOBK0paxzl37Hs 9T4hgal/8RMeu55DVqxuvYLdr6y9grz7tZvJF7nwmUuQbtLno1JYGnDuf6KjbPPttoph8X /khRfSNAyAIfVwf0hQ3tzCZ2p4Qq1iL0jBLrAoG/omVUWSIzeJX0hMNI4IRRZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644500813; a=rsa-sha256; cv=none; b=XgimC/cwvbrQpOgd5tqS4O8TjSFPNxUPY9p+gcM6TuUgL00EjlMAFaYXTfNKYL33Dv8gGM GlbiyHI8MQWfY3zttZVod28bEhO/sH6S8NhTGWoRm/rtFRglsT4BhO5K8VxZMijcHSrA0s CPyMEMTca4vFe2Gd77CSxijK0Rstx/5JxttjWqmyjcYGg9+OSf+Uc0CF4HxtHjH4VPnvQE pexX61+RqIDxIagmaDVWCqJqiCoNBGcvCT6kJII1JH/CF2v6neSIzM3MfQuzUkEXlmZdOq dOvHUAUdA0YvDSCAGYloxCn0l/lR39wrXnsR3UL1RsRJExa04U6nq83HN/cNBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=45711ee38a09b8b8083d13b3aeec64fa2e3d075e commit 45711ee38a09b8b8083d13b3aeec64fa2e3d075e Author: Mark Johnston AuthorDate: 2022-02-03 14:41:17 +0000 Commit: Mark Johnston CommitDate: 2022-02-10 13:46:24 +0000 filemon: Reject FILEMON_SET_FD commands when the fd is a kqueue When FILEMON_SET_FD is used, the filemon handle effectively wraps the passed file. In particular, the handle may be inherited by a child process, or transferred over a unix domain socket, so we must verify that the backing file permits this. Reported by: syzbot+36e6be9e02735fe66ca8@syzkaller.appspotmail.com Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit b84ed4e7f626de5475cf26bae6d7ff15ec9f9675) --- sys/dev/filemon/filemon.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c index cd48c68d8b04..4c3a23a53042 100644 --- a/sys/dev/filemon/filemon.c +++ b/sys/dev/filemon/filemon.c @@ -359,9 +359,10 @@ static int filemon_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag __unused, struct thread *td) { - int error = 0; struct filemon *filemon; + struct file *fp; struct proc *p; + int error; if ((error = devfs_get_cdevpriv((void **) &filemon)) != 0) return (error); @@ -376,12 +377,21 @@ filemon_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag __unused, break; } - error = fget_write(td, *(int *)data, - &cap_pwrite_rights, - &filemon->fp); - if (error == 0) + error = fget_write(td, *(int *)data, &cap_pwrite_rights, &fp); + if (error == 0) { + /* + * The filemon handle may be passed to another process, + * so the underlying file handle must support this. + */ + if ((fp->f_ops->fo_flags & DFLAG_PASSABLE) == 0) { + fdrop(fp, curthread); + error = EINVAL; + break; + } + filemon->fp = fp; /* Write the file header. */ filemon_write_header(filemon); + } break; /* Set the monitored process ID. */