From nobody Sat Aug 20 02:56:42 2022 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 4M8jvH1wLpz4Z0KG; Sat, 20 Aug 2022 02:56:43 +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 4M8jvG6fGtz3QtY; Sat, 20 Aug 2022 02:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660964202; 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=8vyxWLkhpZ0TUMpLN4QucF8fXX3eZ8HPNQfqDBYy/vE=; b=QM6po6NZd1EnsmjClkDnsRhzZcFvjhA8VXgeSEFs/r6kDIoY4oBXhsUm+5qJ66E4s3Gv0Z 6zad5xQqfDDOHix/3mDcM8Hq+jAQ6LEBVFLSOxBVpEOuTTTnlVMtszbVwxtpGfJIk6VbV+ A4xuzZkBgN88OViqB/F8kc2lryyB0pKWCYAjWznejMChDBwfKht7Qb2RrXchMQKP46Xf35 xyp1KSgYLsidO3pDRJgrth2w6/0Se3ooHc86HoIJeRI1YnL4OVqowGk0b/UgbojA9z0r74 kxivG8pO0uVYmAqNNxpk0/xBgsqgBEE3Thj5iyVB+wkLtlbLRIGt9dwLJvh+rQ== 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 4M8jvG5R7TzH8F; Sat, 20 Aug 2022 02:56:42 +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 27K2ugJe051843; Sat, 20 Aug 2022 02:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27K2ugpc051842; Sat, 20 Aug 2022 02:56:42 GMT (envelope-from git) Date: Sat, 20 Aug 2022 02:56:42 GMT Message-Id: <202208200256.27K2ugpc051842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3c69525933e1 - stable/12 - ses: don't panic if disk elements have really weird descriptors 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3c69525933e1ae5f0e7149ef30320bf4e64d9628 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660964202; 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=8vyxWLkhpZ0TUMpLN4QucF8fXX3eZ8HPNQfqDBYy/vE=; b=WzUEsQ6z6NCOAZygdmyvbraFytQsDaq/Tabls4ezwxlGcP005qzWeWf8BzcS7ohbzTripq SlXjYOKzNjNAeeHIdOgUz9y0aCfxcZ+EM9lPzWiqECMTgGBHJH2PyaBbUICelpc6MVii1m DxBjk3hkKGKDfgv10Pks7ATgbH5C9e2FrrDz/C2ePqqDNbu/d1bNfmdAiYma8x6IHEwc+S 3Wy54we+3s/vyfNqFxzG5GluRDhlp7I6pRwKoExe7YkthICPyz1BL1JKIlat+VxrCx+kt4 d/z/9GlFB1TxhTxeG7tfRaS5IEjhORgTEmoL7NS+13j4BtLfxa5/kMrS2Re1VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660964202; a=rsa-sha256; cv=none; b=QvyGCE8Es7vCL0uQyYXbN8yfU5UT9gcmlYl2tIv8i6bKe6IX0X8TQINbZ/IA9Fctdzmo3M XwyTAJnymTbeSsWQtqVFhzNZ7koZiZtJzGzNl/dpjWcZuZM+bBw6w30kw91pQOYQVWv+iI uDkuMn9XjStLlHT0AhLop9Ao9HBWk29KSERkTyyYhTucIt2sYAhS+O98T2dV1qE6BGbzna XPkZ+i9Ju6EmcCUJuILlmkGZ+8BmRkgtEqgjiQ0voqN1afdbcwGvnc8DN5z5F2D4HSOVso zO0gyfvWvOVd7rQNQ8TBAOA23XPYCl+nyvGUZ6O8NbnDkck0G8p8ix+jy3kpcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3c69525933e1ae5f0e7149ef30320bf4e64d9628 commit 3c69525933e1ae5f0e7149ef30320bf4e64d9628 Author: Alan Somers AuthorDate: 2022-06-10 22:44:59 +0000 Commit: Alan Somers CommitDate: 2022-08-20 02:51:58 +0000 ses: don't panic if disk elements have really weird descriptors SES allows element descriptors to contain characters like spaces and quotes that devfs does not allow to appear in device aliases. Since SES element descriptors are outside of the kernel's control, we should gracefully handle a failure to create a device physical path alias. PR: 264513 Reported by: Yuri Reviewed by: imp, mav Sponsored by: Axcient (cherry picked from commit 5f438dd3acba47e54e63b13bfff31a49bcc6ddea) --- sys/cam/scsi/scsi_pass.c | 5 +++-- sys/geom/geom_dev.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 965ac00539e1..2d44a44ad4d9 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -459,8 +459,9 @@ pass_add_physpath(void *context, int pending) && strlen(physpath) != 0) { mtx_unlock(mtx); - make_dev_physpath_alias(MAKEDEV_WAITOK, &softc->alias_dev, - softc->dev, softc->alias_dev, physpath); + make_dev_physpath_alias(MAKEDEV_WAITOK | MAKEDEV_CHECKNAME, + &softc->alias_dev, softc->dev, + softc->alias_dev, physpath); mtx_lock(mtx); } diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 1d20e4e0bf0e..1a33b35c4b02 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -258,8 +258,8 @@ g_dev_set_physpath(struct g_consumer *cp) dev = sc->sc_dev; old_alias_dev = sc->sc_alias; alias_devp = (struct cdev **)&sc->sc_alias; - make_dev_physpath_alias(MAKEDEV_WAITOK, alias_devp, dev, - old_alias_dev, physpath); + make_dev_physpath_alias(MAKEDEV_WAITOK | MAKEDEV_CHECKNAME, + alias_devp, dev, old_alias_dev, physpath); } else if (sc->sc_alias) { destroy_dev((struct cdev *)sc->sc_alias); sc->sc_alias = NULL;