From nobody Thu Nov 23 17:07:05 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 4Sbl095b11z5220n; Thu, 23 Nov 2023 17:07:05 +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 4Sbl0954G4z3Btv; Thu, 23 Nov 2023 17:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700759225; 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=DUlYk5LHXXGtkKlfTo9G/xL4Eda83mmK8rpF+yA+q2Y=; b=ozF2rUk6u88PGc7KUHTT3YzuVeZxvDI+3Y4HojyEvpMcCVUFEO/tHShCIsYzGHQdwIZCRK +qL1BK6sEM3ILo4r9UmljnHkkZQF9ZrlP6Ntv4Avb+bQPedCabqr7IZp1XfbwPDZ815XMB 5oG00paFl33XgyUFrRM7qL39qJ4z+vMsYE7Bxba5JwroUHi13GzPZOcwkG32Z62vS/PXHB q82Ssw+swycgvRJzFL43x4xv8XdsQ8PLB7EW2FaxBx/YpJsp4l+EBG7xdCTHR+egODcWrn 9Fhsv4A6QeIpru9QbSxJSgf7yGfaT/NSkqSOGE2dD6d5mO/myJXY6fElhx7BCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700759225; 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=DUlYk5LHXXGtkKlfTo9G/xL4Eda83mmK8rpF+yA+q2Y=; b=Q2XfKIt9a7G7RMWNPv3S6hovNUKP/yRZbkhP/zYqyGOij2Ol9XK80qgtWofk6VwbZQnumH N08gJ7J3vs8VoE001pTMcM+8TF34/ISz2aIyjwQkoefZ38q6k8GIUrsmY3y8ZQzW3CaFPu 9hLjJKId2a/v0GDOfbxZiUlwtgdSgpMR0nNozyWEM1hZhsr5Jj0a3D/iZBnR+f6s3szzHi TqJfDa5GTRHpaQox5FzbZK/8dKOcpIbw6F8TY17EFixVEbYAFZ36qoN2zLP8ipFVIrfNNe 7hBpnaG0XqMoJmbhFCI+gZFmW6KM87Tki4QaZd0he3QxI12DymBYoW+JeBJ2Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700759225; a=rsa-sha256; cv=none; b=iSDGrwZC3RzzQPCP4nO9oOp4YMRz8RCloUsNau/NAb3lIn57ioXx9mbcHJW18Bx1PWwf96 rwIBjgtLn5tk+eAZ2zE1MlFAxb6l+wW3lKMW/eVEUfsp9DVE5WqNp/TTepzw34oFXRezMZ 9jAfj6/tIhEvKsCaEczuWBrnt9niVLtR4ebCMauxNQb6vxxKjUdQxXpWiXONo5x8PJXgSX MsnoBBBcmYhV82HECfzJssh03ToUH/Qk3ftHbtdDjKGM0tGr3ybhy91wKaYO1kIuRdyX21 r+g5G+el5gUbRVBzg3lrJlMLblL3dIPh5OsVWu/BbJNWyp4QInPEWyiuvbfHsA== 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 4Sbl093rqDz199Z; Thu, 23 Nov 2023 17:07:05 +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 3ANH75h3008758; Thu, 23 Nov 2023 17:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANH758D008755; Thu, 23 Nov 2023 17:07:05 GMT (envelope-from git) Date: Thu, 23 Nov 2023 17:07:05 GMT Message-Id: <202311231707.3ANH758D008755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 19f073c612af - main - new-bus: Add resource_validate_map_request function 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19f073c612afa0111d216e5ccab9525bfc97ec32 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=19f073c612afa0111d216e5ccab9525bfc97ec32 commit 19f073c612afa0111d216e5ccab9525bfc97ec32 Author: John Baldwin AuthorDate: 2023-11-23 17:06:24 +0000 Commit: John Baldwin CommitDate: 2023-11-23 17:06:24 +0000 new-bus: Add resource_validate_map_request function This helper function for BUS_MAP_RESOURCE performs common argument validation. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42723 --- sys/kern/subr_bus.c | 31 +++++++++++++++++++++++++++++++ sys/sys/bus.h | 6 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 648394abd026..80fe182eab56 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -2715,6 +2715,37 @@ resource_init_map_request_impl(struct resource_map_request *args, size_t sz) args->memattr = VM_MEMATTR_DEVICE; } +int +resource_validate_map_request(struct resource *r, + struct resource_map_request *in, struct resource_map_request *out, + rman_res_t *startp, rman_res_t *lengthp) +{ + rman_res_t end, length, start; + + /* + * This assumes that any callers of this function are compiled + * into the kernel and use the same version of the structure + * as this file. + */ + MPASS(out->size == sizeof(struct resource_map_request)); + + if (in != NULL) + bcopy(in, out, imin(in->size, out->size)); + start = rman_get_start(r) + out->offset; + if (out->length == 0) + length = rman_get_size(r); + else + length = out->length; + end = start + length - 1; + if (start > rman_get_end(r) || start < rman_get_start(r)) + return (EINVAL); + if (end > rman_get_end(r) || end < start) + return (EINVAL); + *lengthp = length; + *startp = start; + return (0); +} + /** * @brief Initialise a resource list. * diff --git a/sys/sys/bus.h b/sys/sys/bus.h index fc07cf70f78a..88ae4000004b 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -317,6 +317,8 @@ struct driver { KOBJ_CLASS_FIELDS; }; +struct resource; + /** * @brief A resource mapping. */ @@ -341,12 +343,14 @@ void resource_init_map_request_impl(struct resource_map_request *_args, size_t _sz); #define resource_init_map_request(rmr) \ resource_init_map_request_impl((rmr), sizeof(*(rmr))) +int resource_validate_map_request(struct resource *r, + struct resource_map_request *in, struct resource_map_request *out, + rman_res_t *startp, rman_res_t *lengthp); /* * Definitions for drivers which need to keep simple lists of resources * for their child devices. */ -struct resource; /** * @brief An entry for a single resource in a resource list.