From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794513193; b=OTVNnQUAi7dmgHADdXAgJVcLKOifu0Fq228qzm//3tTIWvuvfRMlTaH450UOPfp3327L Sk1hnu6Tjd/QhXTsYHz0ZYz+XoK8MDmAZwwelao6ueoDdNaUVwp0glwtspec61jBJYZC8 Vm308VKfPwrYsPXgLXYK+0iKXeZpXUlWOj7eUHhie0W4e+0LHU7zXrv+74A3pKgoqrcxC G8NfuEL9TskGmOvi0+A1HZhNRIMiMp8oHawLL+6UuYrMLKi2kBF1ClUChnHKLZGDSS9N1 12oDzr2hKtq7jIEWz1TiQksewRvONRhZ9j0aEK7HrdKV9QdMPnqKi9zzrSWaP6phrjg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794513193; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Content-Type:Date:Message-Id:To:Cc:Subject:From:In-Reply-To: References:Content-Transfer-Encoding:MIME-Version; bh=slMJ/jl0C3PRYQL80eM6Rik84HUmAPDqG/+JqwCg8f0=; b=fmekArBZtcs0evsF2JywPDUffC3Xo/u0IDfe5BYa3u5muygdYAQvjt+zTOFhV0xMFKZ5 FDG+TOYXszwrK9aWTEt4KZ1fZG7mdF4WrQnvz+k5ur6O1w4HPxrCKwf6AXWQm8BkmhXOg ZWrsX2SsJijL+SicKtkLMkQ+xgSeemJmRiTj2AtKaMY6TUQzTHvAWsmmlr0Yk434gGXEh IJ8Pz25zWoug+pPP9XfQ/uPa9uxhfw4HgemGtb/4vgt5RqUoqf62iy07YQ42RifSPVeWw kpqyuDS3UocV0l7c+Ph4MkWjMJ8FRBREmUS4651duCpw1Zq1DNRFAho5yDAf60lKh+w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=XOvykWdZ; arc=none smtp.remote-ip=209.85.214.182 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B978C606A8A5 for ; Thu, 12 Nov 2026 19:53:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B978C606A8A5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=XOvykWdZ Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ed08b07213so1190445ad.2 for ; Thu, 12 Nov 2026 11:53:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794513192; x=1795117992; darn=vger.kernel.org; h=mime-version:content-transfer-encoding:references:in-reply-to:from :subject:cc:to:message-id:date:content-type:from:to:cc:subject:date :message-id:reply-to:content-type; bh=slMJ/jl0C3PRYQL80eM6Rik84HUmAPDqG/+JqwCg8f0=; b=XOvykWdZa8akqe46XxXcrhPdSdqBzB7qNT4fuFywibfxQufgbTNScOQjj91AfQqUZw wmbVWY6cyWAogeH+okdshWEXjy++ULfcj4DQ9nRE1p5Q07j61mwgC5xiXku5NX3VeaJf jzGj5QgklpL2p6GeZi5PywWO0zN8hv5iG3w2BfhW/grvky+gs6T8hwl7wD0GeIw+r4Y7 tbwRpUv+wXlFY11ybqJtpnPlvWZyMvMFNlu79mVZ3Nw3NAnT7oYMN1jJZ13VwHKWsX9f nLAZ8PU3gD+zm7kHmsHmshoT2Bb+y8BOMpYkjVVhGXHOpsv6kRL+zhP/btDwUKU1OFGz TxgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794513192; x=1795117992; h=mime-version:content-transfer-encoding:references:in-reply-to:from :subject:cc:to:message-id:date:content-type:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=slMJ/jl0C3PRYQL80eM6Rik84HUmAPDqG/+JqwCg8f0=; b=z53ajt/Vc0Kb7rhK5vAaa0Z8N2yPhfPqXAQlK3VQcTstb7ll5DsgzJgm0DKmcXgOgY 9TnCpmaqfXbz5moOMGhchsLGdBPT+bICaW9dLctCUxShkcn1ddI988BPCgrYI6zfIGA8 GfRMrZBsDW7MeqMoJY+RlIHKN3mZFLpi0IWRr+wkpUzt9FrVfQyUtyt/DaRs+6XK2qFS 29ls5kSCmbPNgtB2n4321I10yhl27msxx1+t0yjmuaAKwZvjF9SzELySHGf4Kj43MMpv bR4T+KPj0Kt4sUP0mREYg9OeLrHzfjabglmbn3LIvXI/gk63Bg3lZHcZ7D05h4i3h04e cAmA== X-Forwarded-Encrypted: i=1; AL+hErEBVmFdQ80Iq5+ED7+tkCVIlWmRnRrsVNZbUEwUENbbr6E/c8pC+momQaWcFdlQUV/4FnGsN8csWle8xdU=@vger.kernel.org X-Gm-Message-State: APuU4Z93j4DoZOCgpdP0wGglx7VU0GCvKfuijchN6EPKlFllENLImMZx TD9W1Zw7iazohYFSiU0M3JmqT11DgCyVGnPyBiGH1Z5QwVDc1IaC871v X-Gm-Gg: AYBFou3GHfnIg3bnoheGE68xS2tirqycWNdugq992E8T1FhdiBA64uCvfx/w803sswN RsUhP+ZLK/DOjNPz2jGOTUeCJnRxayrl5TDrpnl6FmajkV6EqS7RhkyW1jDHN5GQ+qjpr01LEYz T2SLajh+VZopwsJI09cnQVLmUDgIfM9uejr5ldepIXu3pfVVZJIyvZVsV0U2eQashw3SVltGQLm k2VKdDlNrdN5BdIUgoDublhUnz6iICIIRMMjD5OzudZHv7SUabtWnbxrDu8v/YCXAbKDJKx0aH6 2HzfyZt9gjVIQWUE1Jz/JNUshLiSEN7CeNPKWRuTGoBZcKoR5ueg0IyIEQR4sM5WKdnVxoMQv4Q RZnRyRKU4bKUpv4H6VNHde7dQ/E3nI1zt+yOjJ2uOvmLyXB/sF9XN8KqZrFszqBvtGwTid+H+l/ 1FBLrXbazbDEhVBupdSIPGb9m8DQmuEHlyPUNDTOrwH1Cd/k9NRGz/Uyv9jk5DkOtcRBq6aruG1 t8otC8Lj1TPr9vQohNRbOGR0qo7j1kzagEqj2ZWlfe9xpxVWOoCctrpF/2OiH9NhysN2+EHFOc3 3F5JSCCH/4QaWxjbvtkWJYUghTo/1O8k7GDhEue4krXRKfoF/Y1q/ba0HmaiSjvibaOjvObgb1k 9456q3M2UXwhs6Se/TvWIo5JSjBdTPCRTWbI= X-Received: by 2002:a05:6a20:5491:b0:3e2:82d6:467f with SMTP id adf61e73a8af0-3f7a75bf032mr171001637.26.1794513191665; Thu, 12 Nov 2026 11:53:11 -0800 (PST) Received: from localhost ([153.61.198.242]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8bed2053d26sm90591b3a.36.2026.11.12.11.53.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Nov 2026 11:53:11 -0800 (PST) Content-Type: text/plain; charset=UTF-8 Date: Thu, 12 Nov 2026 19:53:10 +0000 Message-Id: To: "Shihuang Liu" , Cc: , , "Daniel Borkmann" , "Andrii Nakryiko" , "Eduard Zingerman" , "Kumar Kartikeya Dwivedi" , "Martin KaFai Lau" , "Song Liu" , "Yonghong Song" , "Jiri Olsa" , "Emil Tsalapatis" , "Ihor Solodrai" , "Jakub Kicinski" , "Quentin Monnet" Subject: Re: [PATCH] bpf: Reject offloaded maps as map-in-map inner maps From: "Alexei Starovoitov" In-Reply-To: <20261112105620.57520-1-shlomojune6@gmail.com> References: <20261112105620.57520-1-shlomojune6@gmail.com> Content-Transfer-Encoding: 8bit X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 On Thu, Nov 12, 2026 at 02:56 AM Shihuang Liu wrote: > + if (bpf_map_is_offloaded(inner_map)) > + return ERR_PTR(-EOPNOTSUPP); > if (!inner_map->ops->map_meta_equal) > return ERR_PTR(-ENOTSUPP); No need for a new check. .map_meta_equal in the ops means that the map can be an inner map. See the comment in struct bpf_map_ops. Drop it from bpf_map_offload_ops. Then the next check rejects the map. > - if (inner_map_meta->ops->map_meta_equal(inner_map_meta, inner_map)) { > + if (inner_map_meta->ops == inner_map->ops && > + inner_map_meta->ops->map_meta_equal(inner_map_meta, inner_map)) { bpf_iter_attach_map() has the same problem. It checks map_type only: BPF_LINK_CREATE bpf_iter_attach_map() accepts an offloaded ARRAY or HASH BPF_ITER_CREATE prepare_seq_file() __get_seq_info() bpf_map_offload_ops.iter_seq_info is NULL bpf_map_elem_reg_info.seq_info is NULL seq_info->seq_priv_size <- NULL pointer dereference Something like this (compile tested only): diff --git a/kernel/bpf/map_in_map.c b/kernel/bpf/map_in_map.c index 0fa3f2a..9ec3bbf 100644 --- a/kernel/bpf/map_in_map.c +++ b/kernel/bpf/map_in_map.c @@ -38,6 +38,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) if (!inner_map_meta) return ERR_PTR(-ENOMEM); + inner_map_meta->ops = inner_map->ops; inner_map_meta->map_type = inner_map->map_type; inner_map_meta->key_size = inner_map->key_size; inner_map_meta->value_size = inner_map->value_size; @@ -65,7 +66,6 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) } /* Misc members not needed in bpf_map_meta_equal() check. */ - inner_map_meta->ops = inner_map->ops; if (inner_map->ops == &array_map_ops || inner_map->ops == &percpu_array_map_ops) { struct bpf_array *inner_array_meta = container_of(inner_map_meta, struct bpf_array, map); @@ -88,8 +88,9 @@ void bpf_map_meta_free(struct bpf_map *map_meta) bool bpf_map_meta_equal(const struct bpf_map *meta0, const struct bpf_map *meta1) { - /* No need to compare ops because it is covered by map_type */ - return meta0->map_type == meta1->map_type && + /* An offloaded map has the map_type of a host map and its own ops */ + return meta0->ops == meta1->ops && + meta0->map_type == meta1->map_type && meta0->key_size == meta1->key_size && meta0->value_size == meta1->value_size && meta0->map_flags == meta1->map_flags && diff --git a/kernel/bpf/map_iter.c b/kernel/bpf/map_iter.c index a58c148..9e459a2 100644 --- a/kernel/bpf/map_iter.c +++ b/kernel/bpf/map_iter.c @@ -176,6 +176,10 @@ static int bpf_iter_attach_map(struct bpf_prog *prog, map->map_type != BPF_MAP_TYPE_RHASH) goto put_map; + /* An offloaded map has the map_type of a host map and its own ops */ + if (!map->ops->iter_seq_info) + goto put_map; + aux->map = map; err = bpf_iter_map_check_prog(prog, aux); if (err) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 04a3b3c..c8146db 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -112,7 +112,6 @@ int bpf_check_uarg_tail_zero(bpfptr_t uaddr, } const struct bpf_map_ops bpf_map_offload_ops = { - .map_meta_equal = bpf_map_meta_equal, .map_alloc = bpf_map_offload_map_alloc, .map_free = bpf_map_offload_map_free, .map_check_btf = map_check_no_btf, Pls tag the respin as [PATCH bpf-next v2]. pw-bot: cr