From nobody Thu Apr 03 19:32:16 2025 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 4ZTBhJ5cS0z5sM36; Thu, 03 Apr 2025 19:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBhJ2MWYz3SSx; Thu, 03 Apr 2025 19:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708736; 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=YYWbHv9MvDoQmz/Wd7Qi514kseWXqP4vanvNetyY1s8=; b=NIPFByVDBx9zMEJ7kHAO/+lB02Mg0myVr+1RMp2w9gJcBSFzLnEr46k4mu058EqG6G26EP hQgBhes4pEiACTyavzv22qLsSzSJ2gEiGaOlPMX5qrhUPpFB8ZsbcqCdCM4HZyr1SU8mnB Vc17FpPE04GpYvDIM2vGjTYMTr9hEvP0V3U4b/EsVSHyUGhXSbyU3/Og0OuWpQBU9LIQOV RhQMGxR1jz2X3xE7+KVw4idj5mjGNNFwJF36S+8vziwN7tjo2p0SkjqVNfmlC0sBglydbc fpuaeOWQExPyvd/yvkLjEibVGjsrg6/vuHvqNVhgDZxkA/JIuhglJXGWrR4MZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708736; a=rsa-sha256; cv=none; b=EDn/KQgygjBU7IZw6v8WDfvg1/l7ysooicFqb6Azm9ifDspGASC7Q4udT/hLSy3/kF/rhE zgR195Fup9GrxaZqwXdI2ZIfYPe6HOor30X5ujGWXJ6fLqZKd0b52/kHDmuPOl/dSYGfl2 TFZn9SwChCtc+syEEwJqA6D36bhO7c6Wul8BbdAdvYT17zxG0diI0x2SiuOVbKxqfv2KYE MMchbAbo2IPuEEzoNYKXB/oK8RUMfuA3xYn3j/n14K8aTSXnn2EE3ayxg3lLB/MfTJcbow CHzQLqpHRFdHiQYDWBW7Dn5GBIAN626HDe8JmCWoMow7ox1Q+u3qNjr/MbvJGQ== 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=1743708736; 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=YYWbHv9MvDoQmz/Wd7Qi514kseWXqP4vanvNetyY1s8=; b=LyLAnE5KYrqbPwNpj9vVUBnH25AqFuW4qZZIj1i/JDGAg4BXuIZceoeUCVNfBeyfLgKUAD HY52nyze/ihxYkYCmX2oTCnOfRD2/2B/rpX3mxn8fFE0YNf9tL/5/EXC2HTZiJtyfn3LBe f0XMZlqrD2/dSmDR1l9FpV73960kkKhFO8uUA17TZb0i5Eezv1wO2vax9HOcMBS53amaRi 5Yl84jq1Us1DDMRnvbaT4YUBpwxUDiUW8zYTnsLwky079tXy3lxDjmzc0rcYA0wTmknYT1 7gUJ/ptVH3gloQ8KuDZvEpoe7joZvIqmXTXEghDnWr2jaGfRY8C1x1KT7fJs1g== 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 4ZTBhJ1yjLzkM; Thu, 03 Apr 2025 19:32:16 +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 533JWG37040155; Thu, 3 Apr 2025 19:32:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWGjh040152; Thu, 3 Apr 2025 19:32:16 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:16 GMT Message-Id: <202504031932.533JWGjh040152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 75ee4893e87b - stable/14 - MAC/do: parse_rule_element(): Bug in parsing the origin ID 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75ee4893e87b8a98c3c21572562b4368892a8bf2 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=75ee4893e87b8a98c3c21572562b4368892a8bf2 commit 75ee4893e87b8a98c3c21572562b4368892a8bf2 Author: Olivier Certner AuthorDate: 2024-07-05 11:49:27 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:01 +0000 MAC/do: parse_rule_element(): Bug in parsing the origin ID The ID field was allowed to be empty, which would be then parsed as 0 by strtol(). There remains bugs in this function, where parsing for from- or to- IDs accepts spaces and produces 0, but this will conveniently be fixed in a later commit introducing strtoui_strict(). Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47612 (cherry picked from commit fa4352b74580832d7b501d34d09a564438a82c3d) --- sys/security/mac_do/mac_do.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 4ef9b68bf513..edd728ea070a 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -105,7 +105,7 @@ parse_rule_element(char *element, struct rule **rule) } id = strsep(&element, ":"); - if (id == NULL) { + if (id == NULL || *id == '\0') { error = EINVAL; goto error; }