From nobody Wed Jan 03 20:45:34 2024 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 4T51vL6Qrxz56g1G; Wed, 3 Jan 2024 20:45:34 +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 4T51vL57JMz4Pbl; Wed, 3 Jan 2024 20:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704314734; 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=pKgmtfNJ7Oy/Rz+j7hHg459e5VWQrrWmm1x0H/lgRPE=; b=f8l6SdIoiRUeQa4JJrRFkft7Ve6CZTgr1ylFl34ARk7hiHGQiWoYv+2rlWcealuUCkk7DJ g39k/vr00kqBfF2bcWX3km+i3LMJyMN2Q9GGq9+HhpjiIYiIsPT4rFTRn0poJw694IER23 6sCNzZgkRKGN3v9aeLw8D/scNDzVt3FfES/LO4YFZs0Ygx+mzSNLHm4bGSys+0PtX809s/ YdWDPyluvdR34X5P3kYhdkqcvh9vCDJLJlOGn0in5LK0OdAlfTkmCBzSvFD+phHiiJshpZ uAfK0m4HpUGxEojIodgf/gkJ6bN7vSUzGvMgh9iwbt+0qqXtTipsusu7hcx4tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704314734; 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=pKgmtfNJ7Oy/Rz+j7hHg459e5VWQrrWmm1x0H/lgRPE=; b=kPwHGz1iboQE/MMMovVcGRTBPqVghHLsdWX9tgQK5ghSpNWY4vsNpFzwlgCr3haj1CUap8 d0X2+zzZEZ4SBMfjpKplW78PyhFTidIRMmdFGXakGQlBHeIEPebZXbXWxAfFPzXrjHrlKu 0mzFeMrzTXM3Z49EJ9plzsOJtunpJkR8jmTcIdWHDC3iSfVFGoEq7CV/lzceD1sKcqW0q2 OFKQ9M7a3TXddjWx7r7dJ6DqgJwJLLkHlhL7yTkl9JyxX1Ghnkgen9rFCWM+S2XLl6ZXFE OOegk3rlcnKntuZvA87mLW/GSCC2abpEbwMKw1HSZ+EOH93jHW/l5phdM1PJ5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704314734; a=rsa-sha256; cv=none; b=fdKMPJPpw8/AT2gu4l00rOa4z9DTmP8/4gkq1bd/j3haAqaoYYlxWTRJs+GOh4qJ61OWct toB/dpfVJopnuPbFD9xdeFgP0vNMUrzOzDCuffk/bV1pcXAIEvLT9mfyLcc1qJ4fcwDWeK 2NMr7yDJLejKSnoOAUnTdFN84hsV2M2ZH3a7cgmUi2flSSctjJayIS5aVxQotyDxWAxX7O E0aV9rqde3XIMuFO4S6VeG3RkT0Fnu0UZtRHwR6QcaSFSoOuNo00vXc3m5tiQaA0/i6bHp RbvB+V4uoH1K+miALvfhqJGXC2nqAskaNTnjoqWyHx6CrIAelEpubv3lQiHIUg== 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 4T51vL47HHz10yf; Wed, 3 Jan 2024 20:45:34 +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 403KjYQA037399; Wed, 3 Jan 2024 20:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403KjYDk037396; Wed, 3 Jan 2024 20:45:34 GMT (envelope-from git) Date: Wed, 3 Jan 2024 20:45:34 GMT Message-Id: <202401032045.403KjYDk037396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d9c1d04ad59e - stable/14 - new-bus: Add resource_validate_map_request function 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9c1d04ad59ebc0ee33883f0f6b681206677414b Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c1d04ad59ebc0ee33883f0f6b681206677414b commit d9c1d04ad59ebc0ee33883f0f6b681206677414b Author: John Baldwin AuthorDate: 2023-11-23 17:06:24 +0000 Commit: John Baldwin CommitDate: 2024-01-03 20:34:11 +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 (cherry picked from commit 19f073c612afa0111d216e5ccab9525bfc97ec32) --- 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 8caab20cf709..1a73df25ff34 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.