From nobody Tue Apr 29 18:30:30 2025 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 4Zn8531Bcvz5vN5y; Tue, 29 Apr 2025 18:30:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn85301kpz4HZ4; Tue, 29 Apr 2025 18:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951431; 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=7y6pxf5vatB/SyG5pxAWiP84wi2S/DnImKyQ/0nV04c=; b=Bghy+Ls/Ix7N4Sl37fr6F2Ix+SXnb4/V8ryFgHkTwiUSY1V29ec6Um1tE15V235g8VYHE8 YmxXLZrGvYxNEkYrSpPxz2bngcYzUSS0OA8giAO4DYlnjvZoVTyyZ97DwxmlUDaSChnie/ QzGxGPMUZfNgodIXI937qog93p9ndBZMU5oD10bRTzJ9gzQm4UqODpedaZazwUpQVt7NMW rI/CdcdzEjGzFgTZMYD+QDHMEDBw7vWWZgBPl7IiCOv/DmClrFCxpfMSKOebfWL/wnVskf Ng86sjtDjZOkdzQkSQdkxX+UrVZztfNPoGEk+HnuxBMLqj7GsEr0GRP+1kAWaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951431; a=rsa-sha256; cv=none; b=vqyosJW5C+ZrtUynUwYh4tlAlQec2SZPWznBPb8X3O/8JoNQHNBKVHz2dtWoi2zDzXhffc JCThQopoimbZdxXZMy5acl45hKOcg/vD7ww2xFsFgHFWj30dGB0k8LKQlipG1Gamh+I5bg xs8/RMEJBSblhkX1lfVRx4tXwFtIgXCvgLMTNBF6Ry/ncsCUG+YdDgPrvkGdFalDYN3l0G pXZe6OfquspwHiZ0TH7wMu30HAPxitF4vEIKP/OfB2FshEugVRvdJnTWHM8NQ+XKJfUJkQ byhLNxcb3xGKWNqZr+jEej7GxzEuYVKeW9VsMBIy3F5Zp0Cf5MyLdaTHHYDiIw== 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=1745951431; 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=7y6pxf5vatB/SyG5pxAWiP84wi2S/DnImKyQ/0nV04c=; b=jMnBRS8FvG9HEV6lfBUWToQypGmxMA5jTxCWlO1lAVQxFp2GViPM3PnjWFPEkluATMQ/sh mazvXGPNZu3L1tSTThGwNETouUMX8KLPuTDRY4uEPBL2E3lqm3QiVzvuKDn5TkPbJU3JFA GiIfzojhivJ7+IpXMyfzVsXVdk7dEt/HFWPV8nS5ZX7QNoZAFhlpCtNqYJqGa/pbp9tAjB 4VjGx8ptZbAXYXt5pLgw4ySrlWlhZ8Ixgmm3SCkL0/L1PZNx1YSl3paaZBXlft6LPUgXx5 q8s88WzuPoBauCZtsUyTpFMG96E36XfrfoOrqr43b7sSUwNYnm4R+3joBDu0sg== 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 4Zn8526ksDzXQM; Tue, 29 Apr 2025 18:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TIUUp8022332; Tue, 29 Apr 2025 18:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TIUUIO022329; Tue, 29 Apr 2025 18:30:30 GMT (envelope-from git) Date: Tue, 29 Apr 2025 18:30:30 GMT Message-Id: <202504291830.53TIUUIO022329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7bc852d94dbf - stable/14 - pci: propagate vpd read error 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7bc852d94dbf01d4feacd4f2a23b1ac22aea694c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc852d94dbf01d4feacd4f2a23b1ac22aea694c commit 7bc852d94dbf01d4feacd4f2a23b1ac22aea694c Author: Ryan Libby AuthorDate: 2024-07-07 23:46:58 +0000 Commit: John Baldwin CommitDate: 2025-04-29 14:17:01 +0000 pci: propagate vpd read error On read error, we would return -1, but not handle it, causing a zero size malloc of value, and then we wouldd unconditionally write value[-1 + 1] = '\0'. This should be harmless in terms of buffer overflow because we should get a minimum non-zero size allocation from malloc, but it also effectively swallowed the error. Reported by: GCC -Wstringop-overflow Reviewed by: kib, se Differential Revision: https://reviews.freebsd.org/D45895 (cherry picked from commit 39bda097c03780e26e6a25ff59a3e8e77c77563f) --- sys/dev/pci/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index dde50afd9319..8224a6829f3e 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1196,7 +1196,7 @@ vpd_read_elem_data(struct vpd_readstate *vrs, char keyword[2], char **value, int int len; len = vpd_read_elem_head(vrs, keyword); - if (len > maxlen) + if (len < 0 || len > maxlen) return (-1); *value = vpd_read_value(vrs, len); @@ -1217,7 +1217,7 @@ vpd_fixup_cksum(struct vpd_readstate *vrs, char *rvstring, int len) } /* fetch one read-only element and return size of heading + data */ -static size_t +static int next_vpd_ro_elem(struct vpd_readstate *vrs, int maxsize) { struct pcicfg_vpd *vpd; @@ -1251,7 +1251,7 @@ next_vpd_ro_elem(struct vpd_readstate *vrs, int maxsize) } /* fetch one writable element and return size of heading + data */ -static size_t +static int next_vpd_rw_elem(struct vpd_readstate *vrs, int maxsize) { struct pcicfg_vpd *vpd;