From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65CBFC4332F for ; Wed, 21 Dec 2022 14:43:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E3F178E0002; Wed, 21 Dec 2022 09:43:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DEF9E8E0001; Wed, 21 Dec 2022 09:43:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB7368E0002; Wed, 21 Dec 2022 09:43:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BA81C8E0001 for ; Wed, 21 Dec 2022 09:43:04 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 81DFC160245 for ; Wed, 21 Dec 2022 14:43:04 +0000 (UTC) X-FDA: 80266580688.27.30E62B1 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf10.hostedemail.com (Postfix) with ESMTP id E5A5BC0016 for ; Wed, 21 Dec 2022 14:43:02 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XbLS+IZk; spf=pass (imf10.hostedemail.com: domain of sunhao.th@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=sunhao.th@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671633783; a=rsa-sha256; cv=none; b=75XsKJg7CFw1ZDBmtSgyQlmol+D9kC3IE8D/puxH31dLvZzI+Y9ecLHMjDPu45HgL136TY PtClZmLJD1Vd3nzE1s4qpF8UUlFcQFlkYMJWOa0ibK4qrHNjWhRNxPTZo9sh4uvGo8Hyce RfgkpK6w7FVPxBBhdrUP91/C5sV5/9c= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XbLS+IZk; spf=pass (imf10.hostedemail.com: domain of sunhao.th@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=sunhao.th@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671633783; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=OAWHPEdicK+v8KQVffUr5ACCC/uEXMMTXL2oNSyLzUc=; b=kZWH6ZLJLEzQsT3iD91G18rIS5x1QPQagKtB36G0NwrXn8uTeg3bnKPhp6bM+JGXUdYWhI b/p4tf28es5edpVr3I4MK6bSsrNqpDJzfHzIKGdn8Jv4wDXoWzNaDZYQdUrfxe3TgbXGmT 3ixUWITZKTrf9gVQOqQoskmr5mShzOE= Received: by mail-pl1-f177.google.com with SMTP id t2so15737431ply.2 for ; Wed, 21 Dec 2022 06:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OAWHPEdicK+v8KQVffUr5ACCC/uEXMMTXL2oNSyLzUc=; b=XbLS+IZkSNq7JWTLfBD9UTEy7+kwsNWG455cVEHdUP3dn/1dnXuDFxULQn5ltYd4ez shHrqfo0FLZD4BfJg68vGJyX1OQFVupMkRrWarBfZaq4lEX/6sbzznz7etyxWlaK1jQF trcwtf31NDh/v9il4zLaaTIkcOjxVitgnUztzGfQ62wIe63T4Qa8mdYUCCygsbY9MVQV LMEvmNw1WQzMSEU1dUJKKWYKaNd8oflwSmu+faxjqGcDDw5F5+nWJCHOkG4XXVmIBoSc ggoHmHQ+JOw5LilqEfrEOlY2lkaTaucOhLkj/A7brQU9EL44YYhm7Pbqoo8HENkgjU5Q DBMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OAWHPEdicK+v8KQVffUr5ACCC/uEXMMTXL2oNSyLzUc=; b=RZ4B+Y1zstugYMUWBbkV91z0TQPSa8eq8S+EIWfpGtBbfsOqX48paeRg7UtltTKIHI ZOTpsqrKJvsCuQFKTrlibdy9ssRKzyDTJJKlXHWwOu/FjZ9K84Fk20z4uRoax1ZtYXA+ tMC54FmIJCTQJhjIamRG82co1F7Pd6bdSAC7aX528HH4qQrVCkGp4vLulST2Vt2qK7OG KSg4V1VAUe/wBuRUWFl7CUC3EziDsoKSKDfW5pv6wFOyytmHOoKow2YeYkSrfXm+pvNj c9vpYHnPzLcpa6x3DqgFljQxO9MCHl+ijp4KklzfsGixKrEmsESuhS4Jp4RyZ6CzTHli GOFg== X-Gm-Message-State: AFqh2kphfwUgXyKkW51bVFN9YAzhKxNgNYbGqiXT1z2RYMr24kt2VgPU 85nBTNi1vURx18//w0rkl9zCi2redA== X-Google-Smtp-Source: AMrXdXvE8eN0aMXdaEyMjhnsS1KjZ+gJcn2MLJnMveyzLx0Vb6wY12Ex2AciixoMn9ZZ4TMRSBaoVg== X-Received: by 2002:a05:6a20:8341:b0:ad:a5fd:b659 with SMTP id z1-20020a056a20834100b000ada5fdb659mr2353428pzc.7.1671633781342; Wed, 21 Dec 2022 06:43:01 -0800 (PST) Received: from localhost.localdomain (n119236129232.netvigator.com. [119.236.129.232]) by smtp.gmail.com with ESMTPSA id ij24-20020a170902ab5800b00177efb56475sm11550994plb.85.2022.12.21.06.42.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Dec 2022 06:43:00 -0800 (PST) From: Hao Sun To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, daniel@iogearbox.net, terrelln@fb.com, linux-security-module@vger.kernel.org, Hao Sun Subject: [PATCH v2] mm: new primitive kvmemdup() Date: Wed, 21 Dec 2022 22:42:45 +0800 Message-Id: <20221221144245.27164-1-sunhao.th@gmail.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: E5A5BC0016 X-Rspamd-Server: rspam01 X-Stat-Signature: fj1ffah3ph1q8h8yomrhcphb94ts9mgy X-HE-Tag: 1671633782-236281 X-HE-Meta: U2FsdGVkX19cGXc+EOF9FCUg5fJg2inpomaJKuKjMifJkIVd81PDGkP4blvC7vp/8cMuqPA6YO0M5at6lOILuaDtoQiB8z0Ojxk+n5gyTPYske3tUI4wJPuirK7MMvTZyE5+CRdKf4cUy4SK/NmPZWYK2MyogLAo/+UYgCvcVPq8wVH0jIkb2Cot9tdwmWCHQIACxFMfhPWIOG1/n2RLqtGgSX71nSOihhSl4+/f+uPSxQ/1KWbPkplXg0tH0/n+MDq9c4Tw+OVjWi/iJ/s8C0hEKt5QBZhdQWgXRUZHWRgcbmQt1wfx/S0ShOZ/esflYPtN+5AM6yK1yprd5GVW0MYaKABfiZ6u3KB3N97ctkUdgpyFMZcH1h5HWSqU3DSBuu5TovMtyZrJ/XRyDPSHUamZozvNiBhBY4ArR/TGE7zRP+/iJPk1i2rCvksEEy9QpMoQPyDr7P+jdfUYX00SkuAeg5fx2Q9119xpiX5UJxMfS+XY+Bx706Jfj34O0K7aZxWDLJBijFa+UFJIUdPTK5kA8TfUONSU89a8qgCvQTgMWOB3vF4ghA/XevEvidjLCBkOsxGLMltknCII+miCnhEk+YVkNoEN/fVtzZ3rHciqsjhtbQ3w4Q1QN1i1BOIk79/Y9k+VgpIgf2dRLh0JVHU8XJyrfWzJvXIThAns4SN0CkwbC1FSUlTELHJrlFh8Me4iJ37SizWhRgrfdQYLqgeFShXFnDwR5S1ahdpRwqrftRgYSrMCk9AVlGxJ+RTAIHYZPs1Fi2DL3lXERf/SVbQ+3+WSWoInGr5MK+GhL1rfnllR3dSgb3cAZdi4XctQYJj2wvMhBmhWPU9UKLBgTGvQtxgFiTppeo9DWfNAfKuqbCCE2BHdQAJPTPrRSKLHG45MzvYr8Kns5Y747gUGcsaeWIUls5f3OF6iVC8j3qOX2hQBvBAnBsCLSiN2yLgyI+UaF6qKH+j+Hpc+jet HjdjUOLb jQ7bCQ09wrs3qGcKcCbjwXJhhzmU/DPLJEPjMNhUizorVZ+DnnSjJ1Ny5LMwabIHXRX7ZNvstJWjWCsMLt6PxACYSSAKufVh0Z9y4yGHNQl7EgNcjFezHLtc8mqUYLXfOGYoHDovpYlG9MWLzcwmFHM+KJIBs32AAbyEiJcLItj8ETgCSi6R659PQ/DusMjnyfb8Oi/npxWcPwjIAAa6KwPmIlwHjpsZOULVCDO1m7zYiZVo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Similar to kmemdup(), but support large amount of bytes with kvmalloc() and does *not* guarantee that the result will be physically contiguous. Use only in cases where kvmalloc() is needed and free it with kvfree(). Also adapt policy_unpack.c in case someone bisect into this. Suggested-by: Daniel Borkmann Signed-off-by: Hao Sun --- This pattern has been used in several places and we're also going to do this[1], seems reasonable to add this so that bpf and in future others could make use of it. v1 -> v2 adapt policy_unpack.c to fix compile error [1] https://lore.kernel.org/bpf/7d274284-0fcc-061c-582e-3dfb629c6a44@iogearbox.net/T/#t --- include/linux/string.h | 1 + mm/util.c | 24 +++++++++++++++++++++++- security/apparmor/policy_unpack.c | 11 +---------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/include/linux/string.h b/include/linux/string.h index db28802ab0a6..c062c581a98b 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -177,6 +177,7 @@ extern char *kstrdup(const char *s, gfp_t gfp) __malloc; extern const char *kstrdup_const(const char *s, gfp_t gfp); extern char *kstrndup(const char *s, size_t len, gfp_t gfp); extern void *kmemdup(const void *src, size_t len, gfp_t gfp) __realloc_size(2); +extern void *kvmemdup(const void *src, size_t len, gfp_t gfp) __realloc_size(2); extern char *kmemdup_nul(const char *s, size_t len, gfp_t gfp); extern char **argv_split(gfp_t gfp, const char *str, int *argcp); diff --git a/mm/util.c b/mm/util.c index b56c92fb910f..cec9327b27b4 100644 --- a/mm/util.c +++ b/mm/util.c @@ -120,7 +120,8 @@ EXPORT_SYMBOL(kstrndup); * @len: memory region length * @gfp: GFP mask to use * - * Return: newly allocated copy of @src or %NULL in case of error + * Return: newly allocated copy of @src or %NULL in case of error, + * result is physically contiguous. Use kfree() to free. */ void *kmemdup(const void *src, size_t len, gfp_t gfp) { @@ -133,6 +134,27 @@ void *kmemdup(const void *src, size_t len, gfp_t gfp) } EXPORT_SYMBOL(kmemdup); +/** + * kvmemdup - duplicate region of memory + * + * @src: memory region to duplicate + * @len: memory region length + * @gfp: GFP mask to use + * + * Return: newly allocated copy of @src or %NULL in case of error, + * result may be not physically contiguous. Use kvfree() to free. + */ +void *kvmemdup(const void *src, size_t len, gfp_t gfp) +{ + void *p; + + p = kvmalloc(len, gfp); + if (p) + memcpy(p, src, len); + return p; +} +EXPORT_SYMBOL(kvmemdup); + /** * kmemdup_nul - Create a NUL-terminated string from unterminated data * @s: The data to stringify diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 66915653108c..5e9949832af6 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -161,15 +161,6 @@ VISIBLE_IF_KUNIT bool aa_inbounds(struct aa_ext *e, size_t size) } EXPORT_SYMBOL_IF_KUNIT(aa_inbounds); -static void *kvmemdup(const void *src, size_t len) -{ - void *p = kvmalloc(len, GFP_KERNEL); - - if (p) - memcpy(p, src, len); - return p; -} - /** * aa_unpack_u16_chunk - test and do bounds checking for a u16 size based chunk * @e: serialized data read head (NOT NULL) @@ -1027,7 +1018,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) data->key = key; data->size = aa_unpack_blob(e, &data->data, NULL); - data->data = kvmemdup(data->data, data->size); + data->data = kvmemdup(data->data, data->size, GFP_KERNEL); if (data->size && !data->data) { kfree_sensitive(data->key); kfree_sensitive(data); base-commit: b6bb9676f2165d518b35ba3bea5f1fcfc0d969bf -- 2.39.0