From nobody Mon Jun 22 00:41:10 2026 X-Original-To: dev-commits-src-main@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 4gk8Ww25kwz6hfkv for ; Mon, 22 Jun 2026 00:41:16 +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 4gk8Wv6cMfz3MXq for ; Mon, 22 Jun 2026 00:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782088876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ntRxvlWTY3olHXAjn+I5PYxl9XXmbhp5hRcxMTmbcc=; b=vGbGrlUvJBS4Tn5XGxwJ1oSSFldoZ5am+6hyCdR1H+sBsURNxpMoKFdJCJlSgpakMiCC23 l6USMmdoWpyNYztlGFOsqevYJKDUs0kRnsNnKlL3d1vy2QqKO1LO7GXSbkO9sT4/JHdGW9 EY02UAAHPUTDGFHLf9f9m37MdBv3aSow2IiziZfVkFInh6rcucd5LPEM8WO7hsMtMLjIKm pxoOUVz3e54X/wY7CJyMDBlCEK7F4N3ybxmm5hbSAyHtRPnmuzZA1gw6aMnDqkrev7t7hA rb+0TFMmlhgXdOKXJo/ZZWMOeBV3rGHAdKyxBpILCsvvEwQZWy/FVZI4s55tng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782088876; a=rsa-sha256; cv=none; b=aodIDmZWt3PODScFlYVXkPZ5snToGL5+4nwRq1+STJAofT7yW//w+m8R0Yu2v9HeQPYgCv 8acLkeyOLWrEOMJ1vtEQ08UcY+IM6pswD/WDKfkGwHamtzJm2/M8UiwA/viYD7dd5evxzo SSEDaqjDI0oJDVDpvtLhEFF1Og71egllDFVj8pyP2A7NJVVNXXrxwReKm0RaE/OneqLC/T vtazGrfa8USZRmnBYURShglbnylTyvRYloP+jW+jyx7qfV4ntXbKpzfmxg9v9tVfZ7bNAA LzhylP6Yv3ptqI1jn7bTDnFZiCzbrbNh7e4+J+jYxxS4btX+opeyTBx48nyPCg== 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=1782088876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ntRxvlWTY3olHXAjn+I5PYxl9XXmbhp5hRcxMTmbcc=; b=N9P3Adxy2nGJAudAtpDgKq4hrHBdaVjjUCJvh2doQyFUJSChEQwsn0yisBN4fHJLFqWM4q gSmY3LkO+77B/Q/9D/3X2XY/f7D0iWHlDcF0gtmw6yqF8I9fiYypn+UGiQ9RE9G0h6yhmO MS7ioL/HzrBPXrpGLjEWFI6IvIYp51JU8nO6OMUhk8a2w0uX7EB1o4KTeYnx4t3QbmbOxA L3sDtN+5rc9XwYjEIDzOb2VBlRvlqvat0s6b6BKKH0x/MSn0bWvCH1hRiLdFrpo3Fyu82v BofCU7keTPelGPSdvpVspl0kVSXj484Rs1OwdIMF5gD7G8Dohj6+r2VuTi50CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gk8Wv5PGLz8wx for ; Mon, 22 Jun 2026 00:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 00:41:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 51f4e90ce7ef - main - firewire: NULL check on malloc in fw_busreset() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51f4e90ce7ef3b8d036a9d34ab464f4152ca4bab Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 00:41:10 +0000 Message-Id: <6a3884a6.39f92.2fe2b69f@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=51f4e90ce7ef3b8d036a9d34ab464f4152ca4bab commit 51f4e90ce7ef3b8d036a9d34ab464f4152ca4bab Author: Abdelkader Boudih AuthorDate: 2026-06-22 00:30:53 +0000 Commit: Adrian Chadd CommitDate: 2026-06-22 00:31:12 +0000 firewire: NULL check on malloc in fw_busreset() fw_busreset() allocates newrom with M_NOWAIT from interrupt context. If the allocation fails, crom_load() dereferences a NULL pointer. Skip the config ROM comparison on allocation failure so the next bus reset will retry. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D57728 --- sys/dev/firewire/firewire.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index a54cbf9cdf0b..dfb906ba34c1 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -748,6 +748,8 @@ fw_busreset(struct firewire_comm *fc, uint32_t new_status) */ #define FW_MAX_GENERATION 0xF newrom = malloc(CROMSIZE, M_FW, M_NOWAIT | M_ZERO); + if (newrom == NULL) + goto out; src = &fc->crom_src_buf->src; crom_load(src, newrom, CROMSIZE); if (bcmp(newrom, fc->config_rom, CROMSIZE) != 0) { @@ -763,6 +765,7 @@ fw_busreset(struct firewire_comm *fc, uint32_t new_status) bcopy(newrom, fc->config_rom, CROMSIZE); } free(newrom, M_FW); +out:; } /* Call once after reboot */