From nobody Thu Apr 14 08:00:22 2022 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 65A2D1B462BD; Thu, 14 Apr 2022 08:00:22 +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 4KfBhk2QyNz3Bvq; Thu, 14 Apr 2022 08:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649923222; 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=58XjFyh6LlgAPiVOGGhzXJreHNuyhvcL1fuQvGuFw1s=; b=xyQVFv5kR+BB/2AVcBIdwHYqHQyu2r6QXskv9mbPz1ZL38pWcMu0uSNn48Qwv9aGUoRsjb /OEE/rYOhQPQhP2Ad/8wY/1TNCZPqOcdgUPigcR/cwnmROqPkRUep+kmX1A/kDE3yIVX1K z7MPuacVm4C01WExRPNlyf0rvCV1kkbuX4Nphewr5AqisERU/opEb9pKLAnkoli0mn6lkx 0Gjr6PlUpg1OuyacvRP8sKOG8/EV6JqjwfX3rIil2PofwDaJ0cwKgZB0KUP/pSlO8a7JZm 7mRD1RcLb/JkCRGs4uZ5npvhevOwmJQakoBLalC3IgFLsehwKgUkkZPsG4aVDQ== 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 300E01C823; Thu, 14 Apr 2022 08:00:22 +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 23E80Msw002876; Thu, 14 Apr 2022 08:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23E80M0V002875; Thu, 14 Apr 2022 08:00:22 GMT (envelope-from git) Date: Thu, 14 Apr 2022 08:00:22 GMT Message-Id: <202204140800.23E80M0V002875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: bb8e1dfbff30 - stable/13 - pf: use ERROUT_IOCTL() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb8e1dfbff30e5df97fa31c88f8218af054fe166 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649923222; 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=58XjFyh6LlgAPiVOGGhzXJreHNuyhvcL1fuQvGuFw1s=; b=q2z9tg+SQDk/H/wC31lrjn869JPRKl49+DX8J6vWSHfwIEh9QCRKxSbSR3aFzcJL/btVgT Q9bQTYDBeBqnS1bqZ843zkxQeXyP2Ke2SJd7mIWS0DsBIdoF2R1lAJGV9+Va0BaRMjT+Vq 0jfbLJ9bLwD316yXnj/NJmZQVoWp7Mm0fYr4Y4CbO7vDy9ZUw5Xx3Ab8X7o0txeEilz+gk QTIGAFcshFy/7na4i40Glfvc7ieN41JbT4aXa+lEvOtY4a/iat6+kmW1rmoO6GQaI+dpt5 AZ0FD0Yw3RZBfY6xMcmgSLH6Qw4ZYov1FJIHS2HoShNEiLSePk7NN488yTgAEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649923222; a=rsa-sha256; cv=none; b=qT52C40NkHpz55070Wkszo3ns25mj1CC10a/Z+ToPQm8lxQjk2+BuPNhdgTnCRLPu8C8tX YMTsGyoUy6TVWPFxgj7qX3Mm0etVSqm/plc9lU9Wzq0bnWHtvZ8Xi/SkAVylhBAP30Is04 J2QPSkdSQEgiWkTnCipb4yBTPr2cUZTz8iNAclf450ewEANjvZGXtvleDZtIW1uw92FtCL +ztskC7CGdiaviQKxI0d8dIjtzFVdznsY7CAIQNEkLh1FKJHqSESYA/sKrTYR5GmrxO6NB w7hq24B9Rdh7/u5Hm6BJxgvAMGkE02m6LK4vnHUaWtQwrZ2G7xsjcwzbOS4vew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8e1dfbff30e5df97fa31c88f8218af054fe166 commit bb8e1dfbff30e5df97fa31c88f8218af054fe166 Author: Kristof Provost AuthorDate: 2022-04-06 14:45:18 +0000 Commit: Kristof Provost CommitDate: 2022-04-14 07:46:25 +0000 pf: use ERROUT_IOCTL() Use ERROUT_IOCTL() rather than hand-rolling the macro. This adds DTrace SDTs in the error path, making debugging ioctl errors easier. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bef7104571f35eeffc27b25d8857a7940dd23ab8) --- sys/netpfil/pf/pf_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 5d4b90f395d5..fd0eb5b85299 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2683,7 +2683,7 @@ DIOCGETRULENV_error: newrule->cpid = td->td_proc ? td->td_proc->p_pid : 0; TAILQ_INIT(&newrule->rpool.list); } -#define ERROUT(x) { error = (x); goto DIOCCHANGERULE_error; } +#define ERROUT(x) ERROUT_IOCTL(DIOCCHANGERULE_error, x) PF_RULES_WLOCK(); #ifdef PF_WANT_32_TO_64_COUNTER