From nobody Sat Sep 09 15:18:14 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 4Rjc7B6LWPz4sVk8; Sat, 9 Sep 2023 15:18:14 +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 4Rjc7B5wf9z4G9P; Sat, 9 Sep 2023 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272694; 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=CdLAgJMFtmMZikGBUrGXGbzc2QsZCfj2HYobbpLe4DM=; b=kXMW1tMAdpiXhi9i0ZcQnsXhuDEEnxaORVsrGOGqimkCzE36oPJ8q2pJ0pKSiTUevSgU9R 0Emm1/uVYHRZMZZzhcspnubrV5JNYuc8ggQvx2oUircRPB0Ng2ORfR0TsmPbsMFtUmRfl+ 8l1Ax0/6JGZRDgW/sAk78912AFbHf62ZipGeSIaLOxZwy4EG2FzScD4jOdlgG8XOB8Rn7d dN0iJEJXH4Aa7S8dpJnFlNuKrbxFXCzo57L3AqaPU8IeYvIQdKa5N05lIOf1LcNz6YPw6N 2cuIzyL+VlvX8TLnTHqH0w3YVQXj8lOED8AA4NkFtqqqZUkfEtvZ0R4hEtYJcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694272694; a=rsa-sha256; cv=none; b=ARxefwuHCD+ydOR9h2eJ8VmpsUyv9dXflTZn1Qv288YO56wUtPN2Yg8GCP5yFiU8grblv1 74tJqM9fFSvnVgYCVPRvYU1rc2TsntQc7JSGKrxdNXPqNShG7KY/eZq6NWBIwJTDQ2qPV2 6+vZzqKZXc39XvZwJ67RpGXBDp6AeuXCuxwdOJTF5/vAmDjpsK1CFW4BHM7Z5gn9McCgqz cVlm9v2LBdg7LK4UAsctfHhs6xIVE3UmlIK9+SW2iPdTkVORtODnqv9/Cfg+q1CaYd4xkH f4rh3fjla+x5FFfdkMgCiw7KchSpiQLF82S6cjqzKnndaWMs4uO1rmBqqYEtlw== 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=1694272694; 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=CdLAgJMFtmMZikGBUrGXGbzc2QsZCfj2HYobbpLe4DM=; b=g9+1ldfNC+nV2X5Z/4tklB8jgxG7oTKBSwtEnpVljeLF/Z49f9QNuzvOQP2KZXUOn02XZw INd4b4aijob8fJEmWzYma6tNtUMDv4ucfpq65IXx74BEtP5j07r8oEEc0eTRj/Rz+bVp9O GRterZAwmn3aTwCzowJunGlm8h7BRmrMamYTpM1F0uWIqEsJ6jLIw9fM2JL+Y3Fwform74 rFwslxSN7fnuuBeRuWAgacsUHjhWnjTuwpovsxgeeHV0OmB/aY/P3a/NPkfQwa6yBPZiOM qFEmichFhVJdR+1a81ltpdEEt7y+Stz2IANCiD+ie1w5D2oM8XOU9xZPI1ML4A== 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 4Rjc7B4tdgzTpb; Sat, 9 Sep 2023 15:18:14 +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 389FIE1q035316; Sat, 9 Sep 2023 15:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389FIEcn035313; Sat, 9 Sep 2023 15:18:14 GMT (envelope-from git) Date: Sat, 9 Sep 2023 15:18:14 GMT Message-Id: <202309091518.389FIEcn035313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e4e41b39a4dc - stable/12 - iir: prevent negative offsets in ioctl 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e4e41b39a4dc22a31c7d239ca1ac29bdd6c10b47 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4e41b39a4dc22a31c7d239ca1ac29bdd6c10b47 commit e4e41b39a4dc22a31c7d239ca1ac29bdd6c10b47 Author: Ed Maste AuthorDate: 2023-08-28 03:38:30 +0000 Commit: Ed Maste CommitDate: 2023-09-09 15:16:19 +0000 iir: prevent negative offsets in ioctl MFS of direct commit to stable/13 as this driver has been removed from main in commit 399188a2c60c ("iir: Remove"). PR: 273328 Reported by: ChenHao Lu Sponsored by: The FreeBSD Foundation (cherry picked from commit b5a5a06fc012d27c6937776bff8469ea465c3873) --- sys/dev/iir/iir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index 35ceef8d66a5..f6430b7c5a71 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -1855,7 +1855,7 @@ int gdt_read_event(int handle, gdt_evt_str *estr) eindex = handle; estr->event_source = 0; - if (eindex >= GDT_MAX_EVENTS) { + if (eindex < 0 || eindex >= GDT_MAX_EVENTS) { mtx_unlock(&elock); return eindex; }