From nobody Sun Jul 26 21:27:47 2026 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 4h7ZZd39sDz6lvj1 for ; Sun, 26 Jul 2026 21:27: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7ZZd0sPdz3j3X for ; Sun, 26 Jul 2026 21:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785101273; 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=7G59sYz8i3VzxJsd5LuvcpfzBMoSPmgRd3mZmrkxyeI=; b=pFc+7tiZ1ejX5y/VeaW/pkFjDRF08E+11GRxxMcUmn6gWS/w0rCdg2sJMio+ZsYqJ8oSbc Z6NtK6Aq1ySQTHsazmOLiRmgULms6raZNUVn8gajdMDw+ZSw4bup5+3C05EdO3td5U/f6S 2pwjctT36lP21syO4KXO5vxR4HUiPQ6Q0YpRuYbakjc/2W2zd29LYmDB58fux9G5D6k4rX ML8m4qlwqbrP/anNqJXiEMwUx9CuMvunlqoaB2xMpKHKGFlgRib7uTr/5XNLERRETIvPmE t2jInoV6qnSrEDWyCgmcz/T49GwPNVUiWonaMCeZ9RkrKtHs5q/6RC5qXYfaLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785101273; a=rsa-sha256; cv=none; b=vowmvNTes/oJeE3r/Q9tnsK2gV/Y0ByDmEBbzyy13d6TdW7/+J2kI3nFG5TN6WuC+Ylbj0 i7Ugfh/MLyb9A+Wj2VuA54UXYhRtCiHMNPTGRlGmNy/+6AEIIran/5OFIaf4ZVjHyZZMO+ w0Fjl+xkvyuERCpcQG1uXuXhAOvPBEykUQ72QykzfgsaVJhtNkCSPPd/4CGDt3CQGzw3YX p1qQdWFnw3YOuv2ZuHqIZLYDqW/CP4oKhA2dNw3Csu+6gt/ms1V3Q8X1PEGvz9A2fCspvJ qp9P3Q8yywp3gQsCZ3VmZcJ9cF4XF9UKwqBkfnlUCOITFCfdUcOXtCaO5wRkCQ== 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=1785101273; 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=7G59sYz8i3VzxJsd5LuvcpfzBMoSPmgRd3mZmrkxyeI=; b=pTatPPbmuG4n6ElChNUV5OD1sdV4L9yxB2J2AeuZFkr4lKcZC3/As4hN6m7eIy1Zb4e97E NAcT83BpZPfyulkmbwHLjMLSLSgWZbWGXA8DMqCYQm93F56Niw+gzMvToeGUIDXr3pbaUH qXB/UbMtZXo7KGmjj6Q7Zu5BqmouL69tNRh/T+acuVEhBGIEnniSMUImBkZEtcsQE60EhG oyHqvdGMxrXIRYvClT/JoCqYMHNc0rFgzpqSxlst0LLRT8Zs+UvG8uRPkyr4B0DhgQrW5v VMvjWP7VIliWTFQgXmg+ho9iw8HgPrm/+s6eP5WQfqaBsA0prONmKPe/QHzhAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7ZZc705vzg8m for ; Sun, 26 Jul 2026 21:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Jul 2026 21:27:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joerg Wunsch Subject: git: 34ae0f7834d1 - main - cam/cd: avoid integer divide fault in cdstart() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joerg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34ae0f7834d1bd6bb765d1c12e57e01e32b3e060 Auto-Submitted: auto-generated Date: Sun, 26 Jul 2026 21:27:47 +0000 Message-Id: <6a667bd3.426ed.1ab5a52e@gitrepo.freebsd.org> The branch main has been updated by joerg: URL: https://cgit.FreeBSD.org/src/commit/?id=34ae0f7834d1bd6bb765d1c12e57e01e32b3e060 commit 34ae0f7834d1bd6bb765d1c12e57e01e32b3e060 Author: Joerg Wunsch AuthorDate: 2026-07-26 20:54:01 +0000 Commit: Joerg Wunsch CommitDate: 2026-07-26 21:25:53 +0000 cam/cd: avoid integer divide fault in cdstart() If something goes very badly (e.g. forcibly removing a medium while the OS tries to start it), this could end up in params.blksize being 0 (and params.disksize 1). Avoid an integer divide fault, panicking the kernel, by bailing out before. MFC after: 3 days --- sys/cam/scsi/scsi_cd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index e622a96ec77e..1e8dc98d53f4 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -918,6 +918,16 @@ cdstart(struct cam_periph *periph, union ccb *start_ccb) return; } + if (softc->params.blksize == 0) { + /* + * Something went utterly wrong. + * Avoid integer divide fault below. + */ + biofinish(bp, NULL, ENXIO); + xpt_release_ccb(start_ccb); + return; + } + scsi_read_write(&start_ccb->csio, /*retries*/ cd_retry_count, /* cbfcnp */ cddone,