From nobody Tue May 21 12:10:45 2024 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BC7A1E521 for ; Thu, 18 Apr 2024 01:07:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402452; cv=none; b=GZsUUD9VhONFcErR6Tkh2+dls/ExsK0ao/dV6pzGsWnDOtSPTtWfDvGezavWZYSoWHz/s+31pT/bSJ0qiQ2NsDtl/ZYyQzpdk4P4k2PUhWnMLcIbtudJCEhI7liPENF8M2wDpVNRDs3DIsiJYynnEfClRVnUP7C+WNCTTcoQbmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402452; c=relaxed/simple; bh=d167ZLj6rlIcq7zB/ehHfuDbNcPrOcrdXiROJHMaMDk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DWGT91op20iwnthqJzos6ojAUw+fsU7ii7+3rndqG5UC3AESGxpPeXr376gBIN7+gOEOcO1m6QU4Ys57M+NSFCPnbbe/bKz74Mc98w2RUbatPq8n/0beWF6VmjN0L72XTC/SD8U0BtVfVanwtVBqptvnjXETwi7St/ZuVQrWh34= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ePNiZwSd; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ePNiZwSd" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60a2386e932so6016647b3.1 for ; Wed, 17 Apr 2024 18:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713402450; x=1714007250; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3Rwr3eeaVXhAcle1iJOgXmRS8H6PJaYqRipuqiAZK/g=; b=ePNiZwSdJHiBAAiDjdprVRScVDMZjWEwdgOCCm85HNP66RDaOdnDMUnz9qwLmLynLm r0+SqpEJeyC05XYn3UHRXNlnkR98GUsox7vwbUBNiRHUuDNrvEOTZSBRIPrmpUjVQp+E JG5baIwdAW7Qz5RrspSzJEMNAGU4uXdJvs5kdmhM7rHmlollmE2DOqmYlnJOY2m5jMix v/8kPoh1WALoXSHmgq5H0yIQcM07NChZOPDLH23jlXCE5RXZU37tk+Cb6khLDCBDiV2k /4AJaQi6af7m+ee4QKDmP/0XLsvZ0a76I5tETuGM1n+VNzTLe+ZzltZEB2ghx70Sze7T mehQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713402450; x=1714007250; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3Rwr3eeaVXhAcle1iJOgXmRS8H6PJaYqRipuqiAZK/g=; b=f0KxHzYDMHGelq3VqWOa8zZYxjsJxtzJE/7aFQiP4qOBUv6kJYoHqQcNaTAe/DsS8P KxhUNPNpsgFXVMix9qvdDHhVdhOXrrjw+cHsAKBHNJTY9K5Ss2UOVb4N8cFTdJRRQBJu H8m54TxJMwsC7dkQ8VAievVbNpWMtydDpo/KhLnm2JJPcmsYzHdk4pnjuLtVieE/qgN3 Xk6gVIZj02K1TV+fNGonpBREN2xFIwyX2E88ewZC0Tm0U7cXU1GGULw9/bzBFCc6FUO2 n7NkbXWgXyJOJ9qTLebICxhYOT/HjFmEFpkFDjKvzc4laRYRuVcvWeE4mHIhZ+pS0aiu B3sA== X-Forwarded-Encrypted: i=1; AJvYcCVVhz4dx0AKfXlc2Mw/qY19hpMoTxZQfWHyrysFMYWKw4KBKwnMIpxqimZaIWejoev/LJmGmx+E6YswHmEFxXwkpWYVCfi07D5Ol7TZ X-Gm-Message-State: AOJu0YwnMJ1+oacw33j1BzmD9qmTioxXKeeb31i6vGOyfBDv6oG0SuAd 5eiCji39U+bQ9RPdGwTcmXzCdzWJzlI2174ARo+jgK5kSYzCcrHpeGalQ/co0xCE4a4JH1evJri Y2Q== X-Google-Smtp-Source: AGHT+IF9WBHbd9T4P13S7pdp2zs/9YNStoaW1IUA6VdkLQOax1644i3CK82PeDUvQ1iwjkyj4mDd7BQC2QM= X-Received: from edliaw.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:305d]) (user=edliaw job=sendgmr) by 2002:a0d:f801:0:b0:61b:a3:d445 with SMTP id i1-20020a0df801000000b0061b00a3d445mr201303ywf.7.1713402449959; Wed, 17 Apr 2024 18:07:29 -0700 (PDT) Date: Thu, 18 Apr 2024 01:07:10 +0000 In-Reply-To: <20240418010723.3069001-1-edliaw@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <16430256912363@kroah.com> <20240418010723.3069001-1-edliaw@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418010723.3069001-2-edliaw@google.com> Subject: [PATCH 5.15.y v2 1/5] bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support From: Edward Liaw To: stable@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo Cc: bpf@vger.kernel.org, kernel-team@android.com, Edward Liaw , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kumar Kartikeya Dwivedi Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kumar Kartikeya Dwivedi Allow passing PTR_TO_CTX, if the kfunc expects a matching struct type, and punt to PTR_TO_MEM block if reg->type does not fall in one of PTR_TO_BTF_ID or PTR_TO_SOCK* types. This will be used by future commits to get access to XDP and TC PTR_TO_CTX, and pass various data (flags, l4proto, netns_id, etc.) encoded in opts struct passed as pointer to kfunc. For PTR_TO_MEM support, arguments are currently limited to pointer to scalar, or pointer to struct composed of scalars. This is done so that unsafe scenarios (like passing PTR_TO_MEM where PTR_TO_BTF_ID of in-kernel valid structure is expected, which may have pointers) are avoided. Since the argument checking happens basd on argument register type, it is not easy to ascertain what the expected type is. In the future, support for PTR_TO_MEM for kfunc can be extended to serve other usecases. The struct type whose pointer is passed in may have maximum nesting depth of 4, all recursively composed of scalars or struct with scalars. Future commits will add negative tests that check whether these restrictions imposed for kfunc arguments are duly rejected by BPF verifier or not. Signed-off-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20211217015031.1278167-4-memxor@gmail.com (cherry picked from commit 3363bd0cfbb80dfcd25003cd3815b0ad8b68d0ff) [edliaw: fixed up with changes from 45ce4b4f90091 ("bpf: Fix crash due to o= ut of bounds access into reg2btf_ids.")] Signed-off-by: Edward Liaw --- kernel/bpf/btf.c | 93 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 20 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 0c2fa93bd8d2..9a0db26a3bfa 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -5441,6 +5441,46 @@ static u32 *reg2btf_ids[__BPF_REG_TYPE_MAX] =3D { #endif }; =20 +/* Returns true if struct is composed of scalars, 4 levels of nesting allo= wed */ +static bool __btf_type_is_scalar_struct(struct bpf_verifier_log *log, + const struct btf *btf, + const struct btf_type *t, int rec) +{ + const struct btf_type *member_type; + const struct btf_member *member; + u32 i; + + if (!btf_type_is_struct(t)) + return false; + + for_each_member(i, t, member) { + const struct btf_array *array; + + member_type =3D btf_type_skip_modifiers(btf, member->type, NULL); + if (btf_type_is_struct(member_type)) { + if (rec >=3D 3) { + bpf_log(log, "max struct nesting depth exceeded\n"); + return false; + } + if (!__btf_type_is_scalar_struct(log, btf, member_type, rec + 1)) + return false; + continue; + } + if (btf_type_is_array(member_type)) { + array =3D btf_type_array(member_type); + if (!array->nelems) + return false; + member_type =3D btf_type_skip_modifiers(btf, array->type, NULL); + if (!btf_type_is_scalar(member_type)) + return false; + continue; + } + if (!btf_type_is_scalar(member_type)) + return false; + } + return true; +} + static int btf_check_func_arg_match(struct bpf_verifier_env *env, const struct btf *btf, u32 func_id, struct bpf_reg_state *regs, @@ -5449,6 +5489,7 @@ static int btf_check_func_arg_match(struct bpf_verifi= er_env *env, enum bpf_prog_type prog_type =3D env->prog->type =3D=3D BPF_PROG_TYPE_EXT= ? env->prog->aux->dst_prog->type : env->prog->type; struct bpf_verifier_log *log =3D &env->log; + bool is_kfunc =3D btf_is_kernel(btf); const char *func_name, *ref_tname; const struct btf_type *t, *ref_t; const struct btf_param *args; @@ -5501,7 +5542,20 @@ static int btf_check_func_arg_match(struct bpf_verif= ier_env *env, =20 ref_t =3D btf_type_skip_modifiers(btf, t->type, &ref_id); ref_tname =3D btf_name_by_offset(btf, ref_t->name_off); - if (btf_is_kernel(btf)) { + if (btf_get_prog_ctx_type(log, btf, t, + env->prog->type, i)) { + /* If function expects ctx type in BTF check that caller + * is passing PTR_TO_CTX. + */ + if (reg->type !=3D PTR_TO_CTX) { + bpf_log(log, + "arg#%d expected pointer to ctx, but got %s\n", + i, btf_type_str(t)); + return -EINVAL; + } + if (check_ctx_reg(env, reg, regno)) + return -EINVAL; + } else if (is_kfunc && (reg->type =3D=3D PTR_TO_BTF_ID || reg2btf_ids[ba= se_type(reg->type)])) { const struct btf_type *reg_ref_t; const struct btf *reg_btf; const char *reg_ref_tname; @@ -5517,14 +5571,9 @@ static int btf_check_func_arg_match(struct bpf_verif= ier_env *env, if (reg->type =3D=3D PTR_TO_BTF_ID) { reg_btf =3D reg->btf; reg_ref_id =3D reg->btf_id; - } else if (reg2btf_ids[base_type(reg->type)]) { + } else { reg_btf =3D btf_vmlinux; reg_ref_id =3D *reg2btf_ids[base_type(reg->type)]; - } else { - bpf_log(log, "kernel function %s args#%d expected pointer to %s %s but= R%d is not a pointer to btf_id\n", - func_name, i, - btf_type_str(ref_t), ref_tname, regno); - return -EINVAL; } =20 reg_ref_t =3D btf_type_skip_modifiers(reg_btf, reg_ref_id, @@ -5540,22 +5589,24 @@ static int btf_check_func_arg_match(struct bpf_veri= fier_env *env, reg_ref_tname); return -EINVAL; } - } else if (btf_get_prog_ctx_type(log, btf, t, prog_type, i)) { - /* If function expects ctx type in BTF check that caller - * is passing PTR_TO_CTX. - */ - if (reg->type !=3D PTR_TO_CTX) { - bpf_log(log, - "arg#%d expected pointer to ctx, but got %s\n", - i, btf_type_str(t)); - return -EINVAL; - } - if (check_ctx_reg(env, reg, regno)) - return -EINVAL; } else if (ptr_to_mem_ok) { const struct btf_type *resolve_ret; u32 type_size; =20 + if (is_kfunc) { + /* Permit pointer to mem, but only when argument + * type is pointer to scalar, or struct composed + * (recursively) of scalars. + */ + if (!btf_type_is_scalar(ref_t) && + !__btf_type_is_scalar_struct(log, btf, ref_t, 0)) { + bpf_log(log, + "arg#%d pointer type %s %s must point to scalar or struct with scala= r\n", + i, btf_type_str(ref_t), ref_tname); + return -EINVAL; + } + } + resolve_ret =3D btf_resolve_size(btf, ref_t, &type_size); if (IS_ERR(resolve_ret)) { bpf_log(log, @@ -5568,6 +5619,8 @@ static int btf_check_func_arg_match(struct bpf_verifi= er_env *env, if (check_mem_reg(env, reg, regno, type_size)) return -EINVAL; } else { + bpf_log(log, "reg type unsupported for arg#%d %sfunction %s#%d\n", i, + is_kfunc ? "kernel " : "", func_name, func_id); return -EINVAL; } } @@ -5617,7 +5670,7 @@ int btf_check_kfunc_arg_match(struct bpf_verifier_env= *env, const struct btf *btf, u32 func_id, struct bpf_reg_state *regs) { - return btf_check_func_arg_match(env, btf, func_id, regs, false); + return btf_check_func_arg_match(env, btf, func_id, regs, true); } =20 /* Convert BTF of a function into bpf_reg_state if possible --=20 2.44.0.769.g3c40516874-goog From nobody Tue May 21 12:10:45 2024 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21A5C2EB08 for ; Thu, 18 Apr 2024 01:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402456; cv=none; b=Sg4oApO5V9KQUZ53KnJIi8NKRDvmUKnzvqKM22nwNHkU7o+2DkZ6QJe7KfL8tvZuhZEefSDPucjcDU9nT3u5SYOAc1qCTMh3sCyecDKHwNBDCBbjEG0hIEsYeK5wo8WG87suv5IVAOtZLL3PAmvjOOeomA18iBw7R7kyWXKVuPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402456; c=relaxed/simple; bh=hdMC0z91vvJYbvI01dveXo00UXftnvvAxvKn4Y6t0CI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MtAv0z0m0rXWxVZd5qEFRgRxnoINQP1EOTjLoGW/xFPt5+Hzfwqy0ZyrEmvY3kDHxyMGg43OFMuKebdlwoCsYcYjzGlqTh3NzdnwxDrDljnFUPVbR3SdIdUDib0ziXMssBvj680OU8pcZrQuAFaXqqJf+wsp0FBkjzJlrIN0tSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=asElrn9b; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="asElrn9b" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-61ae9ff0322so5805967b3.3 for ; Wed, 17 Apr 2024 18:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713402453; x=1714007253; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LPdsH3unfID5a94BwZ2eo2AhAQkfEbFlWqnVbTkdEDg=; b=asElrn9bmq1Ly7TmzP/VQbj7DrDVi8ImEmgvTYOoH0hU8qpOVzvkm+/9QdoguCNc+U 4o9y79TqyRbWGetg6FfMwbwLAhM7H3oPboihOCfA11vecFEbZHFXeUtZFIif/dtjo5V+ rRxeD2PUxsGi1LM8qJuD4cVhtpD4Vza+2facM9EaIc4dVTLh90oR29VMW52KcSDQcAfV S7its/lmyjSCbhoQJF63cFAM2vNTFY+ULQfcN0iFgK1ojZ+mNquto74NNdQkPTY/i3P2 9x9i7utEmwz4ebLtSPSq+iErr1khQLiNf5CGeve83RLlJLxYR1GeONU/uK+hxTxvpDi6 763A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713402453; x=1714007253; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LPdsH3unfID5a94BwZ2eo2AhAQkfEbFlWqnVbTkdEDg=; b=ELanMFi7yz5/srT5zoV4eSmQ1B721xqQ656F9bMv1VzMdygBaRlrcwdQwi3alZmHYE X26eYfvxG8XoYLoD6hXi+EEwoO23svfsFU8/B8DoRhkJlUAFDmdseTnYnVHBrMHO+zsi dRukdC0yEEU2Z3Yke92OnF3XBuk/Uddyulzi9LnJbdJ20QxxLorfC3XaxlarLjBTBni/ Ebna5VWDVKPSI9agTStaqLdBO8AvCcz04g+ToQ+DqUil6kSd8DaRdZhxROagz6dMcPNX TjZVuoUPY63+WVn64VFDz1KDqPRaEB41uwxwY3TfLeCctzh6guQqBPPF0o+eL8qfLQ0F Shww== X-Forwarded-Encrypted: i=1; AJvYcCWFF5oV+Z6u0dxJnDJouy+77WDqyOGPZ2AtnYpPw0p9FAptN2QN1us8arlYS/JuAwcHji4Kc0v29XVqyLOEmgGc0hbr6IMDFANiW1r0 X-Gm-Message-State: AOJu0YwMfRgj5M1U7wJZWa/m/csBNvZ9GLZTKw6wq2M5pp+8155IvbS0 c9pTKxgiASWpOkWXvD9ncRVHakWGfQw4sw7tUkkB424rnekjSRoqShlHuRwaka62eoeopNu+J1L AHg== X-Google-Smtp-Source: AGHT+IFR37E+g/Hieyk3cbAnHMPPekB2ASXI+KjFwMkBR6XYdvFShHQ6MxZ3cXSjs2LpInjQDvDZDKtKakM= X-Received: from edliaw.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:305d]) (user=edliaw job=sendgmr) by 2002:a81:f208:0:b0:617:cbcf:8233 with SMTP id i8-20020a81f208000000b00617cbcf8233mr221167ywm.2.1713402453368; Wed, 17 Apr 2024 18:07:33 -0700 (PDT) Date: Thu, 18 Apr 2024 01:07:11 +0000 In-Reply-To: <20240418010723.3069001-1-edliaw@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <16430256912363@kroah.com> <20240418010723.3069001-1-edliaw@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418010723.3069001-3-edliaw@google.com> Subject: [PATCH 5.15.y v2 2/5] bpf: Generalize check_ctx_reg for reuse with other types From: Edward Liaw To: stable@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo Cc: bpf@vger.kernel.org, kernel-team@android.com, Edward Liaw , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Daniel Borkmann Generalize the check_ctx_reg() helper function into a more generic named one so that it can be reused for other register types as well to check whether their offset is non-zero. No functional change. Signed-off-by: Daniel Borkmann Acked-by: John Fastabend Acked-by: Alexei Starovoitov (cherry picked from commit be80a1d3f9dbe5aee79a325964f7037fe2d92f30) Signed-off-by: Edward Liaw --- include/linux/bpf_verifier.h | 4 ++-- kernel/bpf/btf.c | 2 +- kernel/bpf/verifier.c | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index 3d04b48e502d..c0993b079ab5 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -541,8 +541,8 @@ bpf_prog_offload_replace_insn(struct bpf_verifier_env *= env, u32 off, void bpf_prog_offload_remove_insns(struct bpf_verifier_env *env, u32 off, u32 c= nt); =20 -int check_ctx_reg(struct bpf_verifier_env *env, - const struct bpf_reg_state *reg, int regno); +int check_ptr_off_reg(struct bpf_verifier_env *env, + const struct bpf_reg_state *reg, int regno); int check_mem_reg(struct bpf_verifier_env *env, struct bpf_reg_state *reg, u32 regno, u32 mem_size); =20 diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 9a0db26a3bfa..be5bd4670296 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -5553,7 +5553,7 @@ static int btf_check_func_arg_match(struct bpf_verifi= er_env *env, i, btf_type_str(t)); return -EINVAL; } - if (check_ctx_reg(env, reg, regno)) + if (check_ptr_off_reg(env, reg, regno)) return -EINVAL; } else if (is_kfunc && (reg->type =3D=3D PTR_TO_BTF_ID || reg2btf_ids[ba= se_type(reg->type)])) { const struct btf_type *reg_ref_t; diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 1c95d97e7aa5..61b8a9c69b1c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3792,16 +3792,16 @@ static int get_callee_stack_depth(struct bpf_verifi= er_env *env, } #endif =20 -int check_ctx_reg(struct bpf_verifier_env *env, - const struct bpf_reg_state *reg, int regno) +int check_ptr_off_reg(struct bpf_verifier_env *env, + const struct bpf_reg_state *reg, int regno) { - /* Access to ctx or passing it to a helper is only allowed in - * its original, unmodified form. + /* Access to this pointer-typed register or passing it to a helper + * is only allowed in its original, unmodified form. */ =20 if (reg->off) { - verbose(env, "dereference of modified ctx ptr R%d off=3D%d disallowed\n", - regno, reg->off); + verbose(env, "dereference of modified %s ptr R%d off=3D%d disallowed\n", + reg_type_str(env, reg->type), regno, reg->off); return -EACCES; } =20 @@ -3809,7 +3809,8 @@ int check_ctx_reg(struct bpf_verifier_env *env, char tn_buf[48]; =20 tnum_strn(tn_buf, sizeof(tn_buf), reg->var_off); - verbose(env, "variable ctx access var_off=3D%s disallowed\n", tn_buf); + verbose(env, "variable %s access var_off=3D%s disallowed\n", + reg_type_str(env, reg->type), tn_buf); return -EACCES; } =20 @@ -4260,7 +4261,7 @@ static int check_mem_access(struct bpf_verifier_env *= env, int insn_idx, u32 regn return -EACCES; } =20 - err =3D check_ctx_reg(env, reg, regno); + err =3D check_ptr_off_reg(env, reg, regno); if (err < 0) return err; =20 @@ -5140,7 +5141,7 @@ static int check_func_arg(struct bpf_verifier_env *en= v, u32 arg, return err; =20 if (type =3D=3D PTR_TO_CTX) { - err =3D check_ctx_reg(env, reg, regno); + err =3D check_ptr_off_reg(env, reg, regno); if (err < 0) return err; } @@ -9348,7 +9349,7 @@ static int check_ld_abs(struct bpf_verifier_env *env,= struct bpf_insn *insn) return err; } =20 - err =3D check_ctx_reg(env, ®s[ctx_reg], ctx_reg); + err =3D check_ptr_off_reg(env, ®s[ctx_reg], ctx_reg); if (err < 0) return err; =20 --=20 2.44.0.769.g3c40516874-goog From nobody Tue May 21 12:10:45 2024 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 946EF4DA12 for ; Thu, 18 Apr 2024 01:07:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402458; cv=none; b=UZFVcOUnSVB/ZIDutla0wPzEyIW5z/AIJZeWP4kMPKaBNyL+goGNolgqt7Y89y+FYMPrXbA7jV4NYQZuQwoA91G5AU2U6lw3WvX+KfLHC3Gap+OAWR7Jm2ctyBlKWsDJp36gJqhYJPaEcZlRT4H5DmWMlxpdvLL8tM4FOgw5GCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402458; c=relaxed/simple; bh=MbU7YSyF5IXinkJkjcfT0u+2sLXGMeKghessXGBFpX0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lhYYmGzHMpvX8BEWxVWj3A2AxTAl1IP60yA5oy38LfXN1VOTeZAEIoKMsMUVBEB01uAbpuay3GJmHgPuShes6ZHcVNK3W6Sb5wRL0Ex5ncG4NGJRCz+pgANOHQKF3gwj8uHfh7loiieL7eYeGvpj/qhDPQ0AHr5lJF3opp+cEvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vrqW4XQ0; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vrqW4XQ0" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-6ed2a12e50aso263426b3a.1 for ; Wed, 17 Apr 2024 18:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713402457; x=1714007257; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ftfV9j6OBLIDvLqAVZnPAyLe0oFUXv4e5neRndjdTGc=; b=vrqW4XQ0BFqv0ya5iqg5r4kPq6PZeBGzeCBWccj+nlXEENmt9NjQuWOFGkeQE6iEkH 16QHTsp74nfai2CnvpThOTem9FaRneGB2TSjHWIy61OaSrQbpW5T/Wd80kNmdqLqFjYN LbL02t1k28RN3q+vZLEwr7NOlncyyaXwgj9kf6ywLCzpYF0ddzPuBW22/w4NBOhTb5HN t8LIPUs5sUinAvj6YK1g+IR31E0cIOvfIq1y5jFjI8xB7XMPQEqACM7V5sZl13SMMGoR jK3Ypx8eHC+mKNSAMsK7e1GMJ8XuxfrM0C8JVqB32zuGRo6w6gtLUn5Q2yXRwa81vuSf iSiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713402457; x=1714007257; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ftfV9j6OBLIDvLqAVZnPAyLe0oFUXv4e5neRndjdTGc=; b=AWq85XsKlyBM08/cu8XFsvy/JNKAiA6OgKudmNP2YVhJ02RauV/kkXHmtgQ70QPrxJ DoKus3dVp7lKse9gzNuvfi+HM+3tG3XnW7bSzLQ8cDtygikOBUek3zzjEaw4QYtg26rP wjV0Z7NF4g+BEl/szI/3S6dWjIOUgIb3GKwr1XMt+fTh7RY4JeJr56F0TWbsTcdeNia6 Hc+jVUXUV+YejIZujnlWQPf4aUvAwW/Ruefh+vW1ZJKC0K9wpm3jYEOMNW9f1RNhm5N1 +C3X7pEkyyniXfwOwouzizEm4WgOpH+iPSdUClGVT36U65OMU5vBhgNX4h/K1oKpCKk/ ZgxQ== X-Forwarded-Encrypted: i=1; AJvYcCUWgfRiuhZrDbmJAFb4blm82NqbnlNcmBJHCwDJj8NGRpZ7HXnpA4w5b9WjU/eM14yEf90GVjwvXQQu5FYS9C+Oz394NjDyhAN6tobY X-Gm-Message-State: AOJu0YzhLk/cBYiVpLhmaFcmXarqCt0yd+iwyj6rYRRme4JmMQjoRAOL yk3+FXBw8v8z/aeneFroUKTZTeuo2Ub+cUQx0IEeJVuLOs25wzabCgYYC2cgpbRR8jkUiyi5FUk Abg== X-Google-Smtp-Source: AGHT+IFxtjf0ehGxX7kGTEvXPkhRF0cutHHpHytnpJHlFL5/6GICLjVVayguK2OZqN59wW0vUIOO9w2oOdA= X-Received: from edliaw.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:305d]) (user=edliaw job=sendgmr) by 2002:a05:6a00:8509:b0:6ea:e009:1815 with SMTP id ha9-20020a056a00850900b006eae0091815mr8773pfb.3.1713402456770; Wed, 17 Apr 2024 18:07:36 -0700 (PDT) Date: Thu, 18 Apr 2024 01:07:12 +0000 In-Reply-To: <20240418010723.3069001-1-edliaw@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <16430256912363@kroah.com> <20240418010723.3069001-1-edliaw@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418010723.3069001-4-edliaw@google.com> Subject: [PATCH 5.15.y v2 3/5] bpf: Generally fix helper register offset check From: Edward Liaw To: stable@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo Cc: bpf@vger.kernel.org, kernel-team@android.com, Edward Liaw , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Daniel Borkmann Right now the assertion on check_ptr_off_reg() is only enforced for register types PTR_TO_CTX (and open coded also for PTR_TO_BTF_ID), however, this is insufficient since many other PTR_TO_* register types such as PTR_TO_FUNC do not handle/expect register offsets when passed to helper functions. Given this can slip-through easily when adding new types, make this an expl= icit allow-list and reject all other current and future types by default if this= is encountered. Also, extend check_ptr_off_reg() to handle PTR_TO_BTF_ID as well instead of duplicating it. For PTR_TO_BTF_ID, reg->off is used for BTF to match expect= ed BTF ids if struct offset is used. This part still needs to be allowed, but = the dynamic off from the tnum must be rejected. Fixes: 69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper") Fixes: eaa6bcb71ef6 ("bpf: Introduce bpf_per_cpu_ptr()") Signed-off-by: Daniel Borkmann Acked-by: John Fastabend Acked-by: Alexei Starovoitov (cherry picked from commit 6788ab23508bddb0a9d88e104284922cb2c22b77) Signed-off-by: Edward Liaw --- kernel/bpf/verifier.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 61b8a9c69b1c..14813fbebc9f 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3792,14 +3792,15 @@ static int get_callee_stack_depth(struct bpf_verifi= er_env *env, } #endif =20 -int check_ptr_off_reg(struct bpf_verifier_env *env, - const struct bpf_reg_state *reg, int regno) +static int __check_ptr_off_reg(struct bpf_verifier_env *env, + const struct bpf_reg_state *reg, int regno, + bool fixed_off_ok) { /* Access to this pointer-typed register or passing it to a helper * is only allowed in its original, unmodified form. */ =20 - if (reg->off) { + if (!fixed_off_ok && reg->off) { verbose(env, "dereference of modified %s ptr R%d off=3D%d disallowed\n", reg_type_str(env, reg->type), regno, reg->off); return -EACCES; @@ -3817,6 +3818,12 @@ int check_ptr_off_reg(struct bpf_verifier_env *env, return 0; } =20 +int check_ptr_off_reg(struct bpf_verifier_env *env, + const struct bpf_reg_state *reg, int regno) +{ + return __check_ptr_off_reg(env, reg, regno, false); +} + static int __check_buffer_access(struct bpf_verifier_env *env, const char *buf_info, const struct bpf_reg_state *reg, @@ -5080,12 +5087,6 @@ static int check_reg_type(struct bpf_verifier_env *e= nv, u32 regno, kernel_type_name(btf_vmlinux, *arg_btf_id)); return -EACCES; } - - if (!tnum_is_const(reg->var_off) || reg->var_off.value) { - verbose(env, "R%d is a pointer to in-kernel struct with non-zero offset= \n", - regno); - return -EACCES; - } } =20 return 0; @@ -5140,10 +5141,26 @@ static int check_func_arg(struct bpf_verifier_env *= env, u32 arg, if (err) return err; =20 - if (type =3D=3D PTR_TO_CTX) { - err =3D check_ptr_off_reg(env, reg, regno); + switch ((u32)type) { + case SCALAR_VALUE: + /* Pointer types where reg offset is explicitly allowed: */ + case PTR_TO_PACKET: + case PTR_TO_PACKET_META: + case PTR_TO_MAP_KEY: + case PTR_TO_MAP_VALUE: + case PTR_TO_MEM: + case PTR_TO_MEM | MEM_RDONLY: + case PTR_TO_BUF: + case PTR_TO_BUF | MEM_RDONLY: + case PTR_TO_STACK: + break; + /* All the rest must be rejected: */ + default: + err =3D __check_ptr_off_reg(env, reg, regno, + type =3D=3D PTR_TO_BTF_ID); if (err < 0) return err; + break; } =20 skip_type_check: --=20 2.44.0.769.g3c40516874-goog From nobody Tue May 21 12:10:45 2024 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AC924F896 for ; Thu, 18 Apr 2024 01:07:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402462; cv=none; b=pSJq/ti602OgKLM0+uQhMR6Rlf/tv/EML7fQet5sb9NFD4qUaYspf6mMErMdKMayEJyfE9ogWYq/laQi5ACVL29UwOlneUeNIW9mapvY59zQXCqTaYPkFqHzBpzW/AxoQKrorIrXc97JhVCUdinjiSHY8SIB2u1tM2Ljp49qhws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402462; c=relaxed/simple; bh=Gy+v3kHc6gUJFOVz0cecKLWhrUu0SiEkWzcElEXVN2Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZRPPF0Zd25cWmGQ2PMvIsnjh3De5aEdODXSISw4FtlKLlHSl+LjJ7gntFPhZo2i1AqgmqjNscIKKyWApotXUnV5eZTWrCzXIjGDqiwLy+3ifKSEupccxUdj8H8kySwLEof9CuBfml4flbmGXHE4xAT2kJ/rXuMHWaEDRkzGlaAU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=nKy8Ip0E; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nKy8Ip0E" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-5dbddee3694so247832a12.1 for ; Wed, 17 Apr 2024 18:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713402460; x=1714007260; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Cs92mryat0OzgsnGDmpmqjunv7BtT58JcaK8X9mxrOg=; b=nKy8Ip0EpUHHR27Yj3g3IcfwKxkfDi7O+ooHXdM1g6ytEgen15I5dJR0O/jgjBzoHT fi3d0eiQYrd68/zAlfQcIV52wCh7Y+Lu32OOvI9DDmIk6di1/z9WQzMJFhN8p+nC1z14 nxvXyeQ9iPRYbiM+xmLhwiINykmY1wcSgqmcDllZgId+2JS8J7c7P/A6gah4VPcsq2PN HioRhwgGggI1ZI02IAOJY88wfqER4gdYgA7gHSn0XVkmvIyRU0qVxS8xHPJuE8nGrBYJ vRWxB5iAx24Fdw6adqBKZ/rF9+omauuJHF7Bsz7TUEUoSBCjItdOoQTkL27pPuZde8qv zlMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713402460; x=1714007260; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Cs92mryat0OzgsnGDmpmqjunv7BtT58JcaK8X9mxrOg=; b=Tq1Ipy2Ph4FyHGkNux1hbXFQAEVuezRKqbXZ0rRQu2cD9tE8Ctq4nUGJNSh83yhso4 rRCmkG4JecaCPY7EmYCtZwp9+qgZpzFKCqpnzZSObw++gFPC4d84bN7Np8AcrzD8+ols 1/cWgPGrEFq6iq7HVF806GlvZvcAVnwzeD2TJRuJyI04PuNvYKkDKIVKibRBlFvbMfYC dIezew9jnfM7o46PvGj4Z42bL1dk1qorHmTOtfAhVTSL2BkPgurtLnNq0eC9w/5/3wMl vYCFU2xEEhRk3VIk8SuzqRhs7K+mJlLyN9Yxk/K9bjq4JA18UAhbVJqa9EIyt6l6vR1E cm/w== X-Forwarded-Encrypted: i=1; AJvYcCXEd23FsBf2jvyp8ke5Z/Iq5o9N5FYF0sgPZDLyUQHxBAN7fnojGepaEwkj6yriQ5xpIb7z2vJzPNa66ZPYXJoWUXuG9hxDyHSwDsw4 X-Gm-Message-State: AOJu0Yy5SncoGbmjpyXxIY2QzSer6PFOL7QYDEyMhuSzu03xbs9T8qA/ bNFgx9mKSKdEuH8tzmAMNyfQILRO/i0vuJ5NGqewxE7ijPJWaudDsE8vP08abWiqD2j9InprZV2 XKQ== X-Google-Smtp-Source: AGHT+IHJxc7eNFka5oLm+urHCgHJgtjUp/kG6lLtOsi7pjI5NnoubZUAgtsoYBT/QXLuYw7ioKAL5C8eHnk= X-Received: from edliaw.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:305d]) (user=edliaw job=sendgmr) by 2002:a63:af54:0:b0:5e8:65ae:1142 with SMTP id s20-20020a63af54000000b005e865ae1142mr3079pgo.4.1713402459921; Wed, 17 Apr 2024 18:07:39 -0700 (PDT) Date: Thu, 18 Apr 2024 01:07:13 +0000 In-Reply-To: <20240418010723.3069001-1-edliaw@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <16430256912363@kroah.com> <20240418010723.3069001-1-edliaw@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418010723.3069001-5-edliaw@google.com> Subject: [PATCH 5.15.y v2 4/5] bpf: Fix out of bounds access for ringbuf helpers From: Edward Liaw To: stable@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo Cc: bpf@vger.kernel.org, kernel-team@android.com, Edward Liaw , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, tr3e.wang@gmail.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Daniel Borkmann Both bpf_ringbuf_submit() and bpf_ringbuf_discard() have ARG_PTR_TO_ALLOC_M= EM in their bpf_func_proto definition as their first argument. They both expect the result from a prior bpf_ringbuf_reserve() call which has a return type = of RET_PTR_TO_ALLOC_MEM_OR_NULL. Meaning, after a NULL check in the code, the verifier will promote the regi= ster type in the non-NULL branch to a PTR_TO_MEM and in the NULL branch to a kno= wn zero scalar. Generally, pointer arithmetic on PTR_TO_MEM is allowed, so the latter could have an offset. The ARG_PTR_TO_ALLOC_MEM expects a PTR_TO_MEM register type. However, the n= on- zero result from bpf_ringbuf_reserve() must be fed into either bpf_ringbuf_= submit() or bpf_ringbuf_discard() but with the original offset given it will then re= ad out the struct bpf_ringbuf_hdr mapping. The verifier missed to enforce a zero offset, so that out of bounds access can be triggered which could be used to escalate privileges if unprivileged BPF was enabled (disabled by default in kernel). Fixes: 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support f= or it") Reported-by: (SecCoder Security Lab) Signed-off-by: Daniel Borkmann Acked-by: John Fastabend Acked-by: Alexei Starovoitov (cherry picked from commit 64620e0a1e712a778095bd35cbb277dc2259281f) Signed-off-by: Edward Liaw --- kernel/bpf/verifier.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 14813fbebc9f..3dfc45ed428a 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -5153,9 +5153,15 @@ static int check_func_arg(struct bpf_verifier_env *e= nv, u32 arg, case PTR_TO_BUF: case PTR_TO_BUF | MEM_RDONLY: case PTR_TO_STACK: + /* Some of the argument types nevertheless require a + * zero register offset. + */ + if (arg_type =3D=3D ARG_PTR_TO_ALLOC_MEM) + goto force_off_check; break; /* All the rest must be rejected: */ default: +force_off_check: err =3D __check_ptr_off_reg(env, reg, regno, type =3D=3D PTR_TO_BTF_ID); if (err < 0) --=20 2.44.0.769.g3c40516874-goog From nobody Tue May 21 12:10:45 2024 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CCDF5CB0 for ; Thu, 18 Apr 2024 01:07:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402468; cv=none; b=XTDH/QcTa1fN2Da+zkZYOCwAzPSoe1CEasuq5HaUfdtHoRcK9uB5shJCaI/3X3unvnwdxULA0T/e1Cr3spHwC3in0apG/Lq4NjPwPch6caSNOaqremYm2a6P3R0cv4kCqMRMuoeJeLQtpdALjYVVqyEVPUgp43JF6MKAWUuSap8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713402468; c=relaxed/simple; bh=vjRJ1U7DKOKEv8zqHNl/1MSWTfJ+WAHC2urS1kF08ZE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mYqYShhf/jcVHCfE/51JcSjV7OBohafPXtSibPDjOGh8XLBrJkDPZJdiSHmLOSljE8StilWEOhYbzTC/artu0tUwptlNik1uNxC8fbddv/fnpF/XzQq9/xK6YOTPVws/tJeaiOuTMHgjfwPZuZ2mLixioy1hGGmWNRKT1WrQ4+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=UHH1q+NA; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UHH1q+NA" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2abc5b4f3c7so217590a91.0 for ; Wed, 17 Apr 2024 18:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713402465; x=1714007265; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=cuQpI8q1wJxBD6X4kJwl22uAmYchmA+XE2ed6Sx/XW8=; b=UHH1q+NAnkAIYmnfTLZbtjKDEB1MeEw/V2YGrHVRgkHNgViYvAcYhGbanCgx1+KyUa mSFsJiFUEggS3i6hBRDxT46S58f8JmbGkcG2+T6NZgnCroX2zcULVWzY3/li6YgWQ88c i9wVom7OjPQSWru/F65Mz3S5CRweovRex77GgbLdeL8p8NR+IzqCAXXPifjv2N1DsmJ4 1xInCgPaK2AApo/85qAuAntj6NYPfJevmg8A88Nbb0i5eTA/i9VXByge+sJ6GkNCmjKR aE3YIbAzCIcSVa4vBW805BJ2xJzSPFdm4WKMv37NanPYvfCqHK9FPMLPFlhb4ZIMvA/+ oyFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713402465; x=1714007265; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cuQpI8q1wJxBD6X4kJwl22uAmYchmA+XE2ed6Sx/XW8=; b=ZRxkbQuoRbMANT0wATmWBUCIdD4pkN0rIr4EBPEUPEve7DVlUI+d/mpuaYx8wrRJBK klaCvMN71ro2m+FOXqfEP2+vFwV0Teub9WDIAyO1hkAh+2UjeR+7206uCuBuocyzer0X n0cASJoUiWkYifP0st/obSo79fOjDdI/fJq7ga+M0B4MpdAPinQ+WAFcDuo/xhf4ByPE GCKwdlDaoFtIM8UAHuXZS3Tx9jTOO3lhxxl3A2YJdgNlhkQggVeXdgCd4dnaiYtwDRPG e54SONtFZe+fnfUHGPXnMMeh5GelntpjGzq5eFv3pAdrsQpTfTNMpOFmpJmk0ll6pSbq RJjA== X-Forwarded-Encrypted: i=1; AJvYcCVW/bgWDjH5Mt9kNUIKsQ6FBkChnUFh0GoFZPP/0ejr6sHE5Xg9FZH8uUool6vGoqS1WktdTbKDASDbMBFW6e9tdVT+BFlOE6fxj9Tn X-Gm-Message-State: AOJu0YxS6O0uKv9UEwEeVZKwZ6T/9mPDaLwFl+YLy2RvuA3AOmEkvsOt 3gK1W4717BOAPo8DEyRfxByCB1PmEh9sVbp7eRpczOaHqNCYT1wqWPuEenlOECdLvsEl0gh2WOT lAQ== X-Google-Smtp-Source: AGHT+IHGZwUXxnIi8umgtcmk1AYnoU9sLsjsWPwJKD9HL4ufshZxqeVmZB8Cu9P+R7pMCrRGbgVEpjMIq+c= X-Received: from edliaw.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:305d]) (user=edliaw job=sendgmr) by 2002:a17:90a:d081:b0:2a2:5697:f90d with SMTP id k1-20020a17090ad08100b002a25697f90dmr2975pju.6.1713402463538; Wed, 17 Apr 2024 18:07:43 -0700 (PDT) Date: Thu, 18 Apr 2024 01:07:14 +0000 In-Reply-To: <20240418010723.3069001-1-edliaw@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <16430256912363@kroah.com> <20240418010723.3069001-1-edliaw@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418010723.3069001-6-edliaw@google.com> Subject: [PATCH 5.15.y v2 5/5] bpf: Fix ringbuf memory type confusion when passing to helpers From: Edward Liaw To: stable@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo Cc: bpf@vger.kernel.org, kernel-team@android.com, Edward Liaw , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Daniel Borkmann The bpf_ringbuf_submit() and bpf_ringbuf_discard() have ARG_PTR_TO_ALLOC_MEM in their bpf_func_proto definition as their first argument, and thus both e= xpect the result from a prior bpf_ringbuf_reserve() call which has a return type = of RET_PTR_TO_ALLOC_MEM_OR_NULL. While the non-NULL memory from bpf_ringbuf_reserve() can be passed to other helpers, the two sinks (bpf_ringbuf_submit(), bpf_ringbuf_discard()) right = now only enforce a register type of PTR_TO_MEM. This can lead to potential type confusion since it would allow other PTR_TO= _MEM memory to be passed into the two sinks which did not come from bpf_ringbuf_= reserve(). Add a new MEM_ALLOC composable type attribute for PTR_TO_MEM, and enforce t= hat: - bpf_ringbuf_reserve() returns NULL or PTR_TO_MEM | MEM_ALLOC - bpf_ringbuf_submit() and bpf_ringbuf_discard() only take PTR_TO_MEM | ME= M_ALLOC but not plain PTR_TO_MEM arguments via ARG_PTR_TO_ALLOC_MEM - however, other helpers might treat PTR_TO_MEM | MEM_ALLOC as plain PTR_T= O_MEM to populate the memory area when they use ARG_PTR_TO_{UNINIT_,}MEM in th= eir func proto description Fixes: 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support f= or it") Reported-by: Alexei Starovoitov Signed-off-by: Daniel Borkmann Acked-by: John Fastabend Acked-by: Alexei Starovoitov (cherry picked from commit a672b2e36a648afb04ad3bda93b6bda947a479a5) Signed-off-by: Edward Liaw --- include/linux/bpf.h | 9 +++++++-- kernel/bpf/verifier.c | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 84efd8dd139d..96b2aa567d23 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -312,7 +312,12 @@ enum bpf_type_flag { */ MEM_RDONLY =3D BIT(1 + BPF_BASE_TYPE_BITS), =20 - __BPF_TYPE_LAST_FLAG =3D MEM_RDONLY, + /* MEM was "allocated" from a different helper, and cannot be mixed + * with regular non-MEM_ALLOC'ed MEM types. + */ + MEM_ALLOC =3D BIT(2 + BPF_BASE_TYPE_BITS), + + __BPF_TYPE_LAST_FLAG =3D MEM_ALLOC, }; =20 /* Max number of base types. */ @@ -396,7 +401,7 @@ enum bpf_return_type { RET_PTR_TO_SOCKET_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_SOCKET, RET_PTR_TO_TCP_SOCK_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_TCP_SOCK, RET_PTR_TO_SOCK_COMMON_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_SOCK_COMMO= N, - RET_PTR_TO_ALLOC_MEM_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_ALLOC_MEM, + RET_PTR_TO_ALLOC_MEM_OR_NULL =3D PTR_MAYBE_NULL | MEM_ALLOC | RET_PTR_TO_= ALLOC_MEM, RET_PTR_TO_BTF_ID_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_BTF_ID, =20 /* This must be the last entry. Its purpose is to ensure the enum is diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 3dfc45ed428a..6162ba31a89e 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -567,6 +567,8 @@ static const char *reg_type_str(struct bpf_verifier_env= *env, =20 if (type & MEM_RDONLY) strncpy(prefix, "rdonly_", 16); + if (type & MEM_ALLOC) + strncpy(prefix, "alloc_", 16); =20 snprintf(env->type_str_buf, TYPE_STR_BUF_LEN, "%s%s%s", prefix, str[base_type(type)], postfix); @@ -4970,6 +4972,7 @@ static const struct bpf_reg_types mem_types =3D { PTR_TO_MAP_KEY, PTR_TO_MAP_VALUE, PTR_TO_MEM, + PTR_TO_MEM | MEM_ALLOC, PTR_TO_BUF, }, }; @@ -4987,7 +4990,7 @@ static const struct bpf_reg_types int_ptr_types =3D { static const struct bpf_reg_types fullsock_types =3D { .types =3D { PTR_TO= _SOCKET } }; static const struct bpf_reg_types scalar_types =3D { .types =3D { SCALAR_V= ALUE } }; static const struct bpf_reg_types context_types =3D { .types =3D { PTR_TO_= CTX } }; -static const struct bpf_reg_types alloc_mem_types =3D { .types =3D { PTR_T= O_MEM } }; +static const struct bpf_reg_types alloc_mem_types =3D { .types =3D { PTR_T= O_MEM | MEM_ALLOC } }; static const struct bpf_reg_types const_map_ptr_types =3D { .types =3D { C= ONST_PTR_TO_MAP } }; static const struct bpf_reg_types btf_ptr_types =3D { .types =3D { PTR_TO_= BTF_ID } }; static const struct bpf_reg_types spin_lock_types =3D { .types =3D { PTR_T= O_MAP_VALUE } }; @@ -5150,6 +5153,7 @@ static int check_func_arg(struct bpf_verifier_env *en= v, u32 arg, case PTR_TO_MAP_VALUE: case PTR_TO_MEM: case PTR_TO_MEM | MEM_RDONLY: + case PTR_TO_MEM | MEM_ALLOC: case PTR_TO_BUF: case PTR_TO_BUF | MEM_RDONLY: case PTR_TO_STACK: --=20 2.44.0.769.g3c40516874-goog