From nobody Wed Dec 27 15:15:03 2023 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 4T0ZvD2W1Kz55nlk; Wed, 27 Dec 2023 15:15:04 +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 4T0ZvD08KMz3J67; Wed, 27 Dec 2023 15:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690104; 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=ZhirxTEaDNBA7yIaLyVwpgfTddHZzA7zGdq2vOyiGZY=; b=UWit+uOZ+2uQW2LJt5NI8NB+TK5wRXXlzBdkj5YZRG+W8BN8rODMiUYVZ+b824xt5XztyZ ju2C3lKABQsn42WuDlhtnitQHiB4itAD2QFGt0M2bo73iC6GIG5BZpSNmT1rxdOFFqPBn/ JBnoLS/PKb28QOscuxaLTkNFYGRi1JxLMx5x8E6LyEwkCfWLrDpLLAIvhl/Oi2anUHZVFW 2w8SG2bUPFBa8qptE1+PeH4NeY7Q+sU9YLVXayGOwVqY1qvvgWxYDPayYsN+Dec/xECWOp WUfAoUeoae7OrI/0BT2L7vyp6LBr3+QBBcbgdJMykymaOoOWycIU+63IqmTBsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703690104; a=rsa-sha256; cv=none; b=wnaOBOxy6c0+cbGc3DRAGoxOaPCTCFKDiXFnOoCwXfD1pHJzVYd1enoYf46lzwP41QcxAM 6HDwgVEnJkJdOahZ556pjATQ6ynZKodyIWf+0qv6Nd49pbuupN9gWnBZj7YGInLfcRVLGg jr3C7lETyVVMugFhQLzdsFXi9JonHWpzbfXfdV7KaTjW6cdefYUxCXrvUCPtC36CzbsvZQ UHZKQ8RrLvabev4hk2XjXhU3SDrVOxadqSN7kZctzV4KvisnGdaGZOmpVAfCHXxMForSIC T3qyxC+XZXKMHU3inT3BIUoju9zSLVctSx1aw/ctgQziO9l3kpv+8AI8qyyQZw== 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=1703690104; 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=ZhirxTEaDNBA7yIaLyVwpgfTddHZzA7zGdq2vOyiGZY=; b=xx3NL9BS12saS2T7m4Tna5tHgZ6nYKSmFuZ2GA8vM5qT3Hi9GIHZugNIULISpWSxtSwppf NkaZHioKts4+qAOnFkmvgpGguEIjvkTTqmz5p9UJnLcFK3Ta0RxCe7Crzw/Q6jkTeDh0Zr m4ONiU9EQgzMGoVHMt0S5xMPt6HfoP3bc+PSa8W/2XEPp63pK8ObPdkHG+AZsdGntFAwsL bTctHx4yk3KXY/3yNIVWtU0CUVkDudJunuDUU9CzzeL2egsFKvN/i9675uJx783cVntGTz ejCLFZAcu0CbzIZKt2ZBpwXerOUoBN86g4UtpdKSgaYEfXkfbSTixsjC3KG1Jg== 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 4T0ZvC6M6Jzk8K; Wed, 27 Dec 2023 15:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRFF3ii047707; Wed, 27 Dec 2023 15:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRFF3ZE047704; Wed, 27 Dec 2023 15:15:03 GMT (envelope-from git) Date: Wed, 27 Dec 2023 15:15:03 GMT Message-Id: <202312271515.3BRFF3ZE047704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 99efa2c88d93 - main - netmap: Ignore errors in CSB_WRITE() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99efa2c88d93c6272a8f54b18d18d0fd9d60f137 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=99efa2c88d93c6272a8f54b18d18d0fd9d60f137 commit 99efa2c88d93c6272a8f54b18d18d0fd9d60f137 Author: Mark Johnston AuthorDate: 2023-12-27 15:13:29 +0000 Commit: Mark Johnston CommitDate: 2023-12-27 15:13:29 +0000 netmap: Ignore errors in CSB_WRITE() The CSB_WRITE() and _READ() macros respectively write to and read from userspace memory and so can in principle fault. However, we do not check for errors and will proceed blindly if they fail. Add assertions to verify that they do not. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: vmaffione MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43200 --- sys/dev/netmap/netmap_kern.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 24f741084a8d..8618aaf82299 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -2450,8 +2450,19 @@ void netmap_uninit_bridges(void); #define CSB_READ(csb, field, r) (get_user(r, &csb->field)) #define CSB_WRITE(csb, field, v) (put_user(v, &csb->field)) #else /* ! linux */ -#define CSB_READ(csb, field, r) (r = fuword32(&csb->field)) -#define CSB_WRITE(csb, field, v) (suword32(&csb->field, v)) +#define CSB_READ(csb, field, r) do { \ + int32_t v __diagused; \ + \ + v = fuword32(&csb->field); \ + KASSERT(v != -1, ("%s: fuword32 failed", __func__)); \ + r = v; \ +} while (0) +#define CSB_WRITE(csb, field, v) do { \ + int error __diagused; \ + \ + error = suword32(&csb->field, v); \ + KASSERT(error == 0, ("%s: suword32 failed", __func__)); \ +} while (0) #endif /* ! linux */ /* some macros that may not be defined */