From nobody Sat Oct 15 18:52:10 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 4MqXRv3Z8Fz4fTt6; Sat, 15 Oct 2022 18:52:11 +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 4MqXRv1FZnz49qf; Sat, 15 Oct 2022 18:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665859931; 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=FWocz0zjXJQkFh4B4QxznnPLAi9D01rfGc2g6E4lPQI=; b=e98HUSMBgLpbKq+QgVWjk32yTffVlVZ+waz3I3LcDnmXc6Yn3NkWTNUa1Z7dxo4ws/JKOs f5LljnPZjgNtIMZd0enHOtNt8kaO9SKstN2pVtB2jiSyvtx1PevLya69VsXZwQKJo/XHy5 P+uWcgD/BkTSovO+bctf/gzx3+54KPbbigeC9MehNFouYeLiwbUCzjdmhN8IVfqbJxkJ0L VbOy4wCfc2yacKbAovEcBAQRYlP8jaiE0yWwEZ5LfLbglVWy6mrLx+jPUOdssfpzGb1FXS SOgsxtrinIzr9/R82cCKqHD6LRc/HrF5jCT4aZFctNroDgEDE65Xbt9DZea8Yg== 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 4MqXRv03H5z1CZh; Sat, 15 Oct 2022 18:52:11 +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 29FIqAuc060230; Sat, 15 Oct 2022 18:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FIqAtI060229; Sat, 15 Oct 2022 18:52:10 GMT (envelope-from git) Date: Sat, 15 Oct 2022 18:52:10 GMT Message-Id: <202210151852.29FIqAtI060229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 39888ed7a3dc - main - kern_intr: Check for NULL event in intr_destroy() 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39888ed7a3dca81c5d5c886e699dbcf58953137f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665859931; 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=FWocz0zjXJQkFh4B4QxznnPLAi9D01rfGc2g6E4lPQI=; b=VsOwzRHcPDr8PZebKxiGVDXkb5ndkvyI6Z93vQxg9A5HVrEjovTQcIKTx6mfnRwmZV4wX4 4gH8y6INUaWcIbOcYeolsP5Pay8UIrcdar/1idfc6OI9OtBlT5rM5sdnh5p7pqvWrnFnNP x0yNYltTZsm8lYniXXX57qrS/HpH5eWTZDsmHVxH9q6IcgYn6Tl0w79OTcd5UjlJk9mYZq 2UAeDRNK8wKiDSNABMe1wye7qfP/sqF2o53T5tqHbWC0XxUjsStSA5sCUxcD5iJExfcRXd PjqXkinWUZ8E6xfu/WpzWSRbiUExAP1yOQDQ5vZPw1tC7fON3BIQQ/lsGIDDuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665859931; a=rsa-sha256; cv=none; b=N8SRJXYkWAHzwL+iZFOOOWM06pNiO1EP2oLy0ggzEI0mYNDUdDGusBYLD7PxEXNepwwddX POJNz2qVu9k4h1mvVZ8vyu2p03oklALM3njGhxd/zp60JVqEbCza4NAXkZ6konWSSuCgI+ H1iw9AnZY44ZyQbj0SHvfL2VC/yQ9bXLgyaKf3jA3dZlJKi/0HEWeBurNlpUoUWZRSy7mg Y9uNeJSDbIvTF3ENjSeZD0o/lAfqJ2vR81Qn4kOjdYqbMDqBpoJsbka5Lozi/2j1FEvAk1 dMCDBRAfXcvM8LoQUcAJhLGAFnkFORVaCjQbLUcJlRZuG4oUZnlhLq6z72E/3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=39888ed7a3dca81c5d5c886e699dbcf58953137f commit 39888ed7a3dca81c5d5c886e699dbcf58953137f Author: Mitchell Horne AuthorDate: 2022-10-15 18:43:53 +0000 Commit: Mitchell Horne CommitDate: 2022-10-15 18:51:44 +0000 kern_intr: Check for NULL event in intr_destroy() It likely won't happen, but is consistent with the other functions of this KPI. Reviewed by: imp, jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33479 --- sys/kern/kern_intr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index bcd5dc82864e..2d44e657b7f0 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -532,6 +532,9 @@ int intr_event_destroy(struct intr_event *ie) { + if (ie == NULL) + return (EINVAL); + mtx_lock(&event_lock); mtx_lock(&ie->ie_lock); if (!CK_SLIST_EMPTY(&ie->ie_handlers)) {