From nobody Tue Mar 29 19:01:01 2022 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 29E051A463F0; Tue, 29 Mar 2022 19:01:02 +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 4KSf6Q0jdnz4xh5; Tue, 29 Mar 2022 19:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648580462; 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=LKK2ylxy7Aa2z82vAOcyRLUGc8xYBirEnYX8eqn5Mn0=; b=tTMsbM7vwGujc6bV1xuetV8aNnLMBtPvAgNR0Q64v3Hyc0QS3QvnqzssgGLcZcAdb+qpqo z1RrkrAtGcNIrFNJDACMyju0PPovKLRQRZs9lTrjNpM/6F5f/kw9xzunTi+kNquPZS6ZW5 HPT8ujblPDRfDDtBnJfFErQAEmWeu9tpgbzkEbKsbuP+JVei6spqy6hBk+it4gZG+1r4bt 2pdpuPrpAA6uLEGuvdrBgCJNK83CUYqM2yKpz00VJ32w1h5/Jutl0IrgG0ovYLrJAewh5A u4SREK+Zv7XVlCw6qfEHGvERxxBrkSbVLYp7mnZ3EpDdRPTH8jyqP0RAZ/522A== 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 ED2802413A; Tue, 29 Mar 2022 19:01:01 +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 22TJ11eF029543; Tue, 29 Mar 2022 19:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TJ11Mr029542; Tue, 29 Mar 2022 19:01:01 GMT (envelope-from git) Date: Tue, 29 Mar 2022 19:01:01 GMT Message-Id: <202203291901.22TJ11Mr029542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e123e2294cb5 - main - pf: guard against DIOCADDRULE without DIOCXBEGIN 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e123e2294cb50deb288916b79a8c05a006f8bca3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648580462; 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=LKK2ylxy7Aa2z82vAOcyRLUGc8xYBirEnYX8eqn5Mn0=; b=HGa/fuzR7CfXRVkvGtvi4jeJkUUDsQMIU7LBSwCN/8gdBjQtlg+1MaeMujBrTGUWVFEy51 v2VY6YHWgRt6XWMAnrFac5BEEnBnFFfY16FOezF5db6jCzH3qnc0tIIBWN5Dwg8oglwrZ/ sLsSYysam2hICh8VRZLxLMXlRxp6bTJWKM5OFWQ8rM9ElY5U2i0IOiRpG8csuUxYQbSfgH WtRkKer1W/ZmcGx51Qfk/vMjyPEILMm09TCTCF8RD5N+WuRmwsFI5kE2Me/0q7pl+Mb772 ACLZCJwuTjGtOK7807QqFxyXuhWGsNfsSJ3wLV3J6k8Susur2XZzOxqRE2WMVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648580462; a=rsa-sha256; cv=none; b=cfznbKSdGPqIGSoCYvf6Sex/BROYetme+WVNjAMozRIfYMY9O1+TY2JxTSrubXJGk5JJwz wmmNv3qskExq1chy/z+70OtRictX9HkSQfsRuaeFKy18TaR6Snqe3sHAtCjhvUD5DPNvJ3 utMcsBW3r80SLRdMWdh1U+nRBaZRBrCxaCABMN8LRpiVHBNqpIKouvyqvhh5WTfiyUe+nQ XMmsTm7k08ZU/0/tPKLYviGjp8jbX4TTauZfsasF3HrZ3Yw1sbDArfUC2pg9zd2QZSk/Nt M/z80707aoF+NTe+Al4EYb2BtNJ1axTqngOeICXgiYTXsEina64G7hgUoUZO4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e123e2294cb50deb288916b79a8c05a006f8bca3 commit e123e2294cb50deb288916b79a8c05a006f8bca3 Author: Mateusz Guzik AuthorDate: 2022-03-29 13:17:54 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-29 19:00:55 +0000 pf: guard against DIOCADDRULE without DIOCXBEGIN Possibility to do it was always a bug, but it runs into crashes since recent introduction of a per-ruleset RB tree. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Reported by: syzbot+665b700afc6f69f1766a@syzkaller.appspotmail.com --- sys/netpfil/pf/pf_ioctl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index ae07fe80fbf8..6012825ead9b 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1364,7 +1364,7 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) rs->rules[rs_num].inactive.ptr = old_rules; rs->rules[rs_num].inactive.ptr_array = old_array; - rs->rules[rs_num].inactive.tree = NULL; + rs->rules[rs_num].inactive.tree = NULL; /* important for pf_ioctl_addrule */ rs->rules[rs_num].inactive.rcount = old_rcount; rs->rules[rs_num].active.ticket = @@ -2137,6 +2137,16 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, V_ticket_pabuf)); ERROUT(EBUSY); } + /* + * XXXMJG hack: there is no mechanism to ensure they started the + * transaction. Ticket checked above may happen to match by accident, + * even if nobody called DIOCXBEGIN, let alone this process. + * Partially work around it by checking if the RB tree got allocated, + * see pf_begin_rules. + */ + if (ruleset->rules[rs_num].inactive.tree == NULL) { + ERROUT(EINVAL); + } tail = TAILQ_LAST(ruleset->rules[rs_num].inactive.ptr, pf_krulequeue);