From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C669C12B99 for ; Thu, 9 Nov 2023 15:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="acwA7soY" Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3703F30E5 for ; Thu, 9 Nov 2023 07:20:44 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9e1021dbd28so167060166b.3 for ; Thu, 09 Nov 2023 07:20:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699543242; x=1700148042; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id:from:to :cc:subject:date:message-id:reply-to; bh=i/csd2ofySDNx5zDvNoMRaakA5kwV/5Pa8lXQvojtSg=; b=acwA7soY7Zmmg5i9wDCdPrwCBFblHV8+FY2Pf8zmL8OV3bD4lgVBJo5fYvHBDdbZAV uqBnGH96hraLZmUzHIiA+EZvDTk5XPOzUmIrXa4EIcqWE+RbxuQB//AXBX2M/RC1sGnf 3RHCQeG/xyfI+eGRpzhdbu2wTSctmTajrLAfbkS5wTGd6YOjiZZPNjQq/uAmydzR79v7 SBgcKgHjMSyOIVwU0FwDfaLJzGwBudmlKYC7e81aU+nxwaaL1OEU5If2muqq7fFRSFwZ mnu/IPnEZIaFfRKFW7KknSim2uktsgi57hs7XNmxN1QctAS6+Gqwo7g8gl/CFtmPLbdz y9uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699543242; x=1700148042; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i/csd2ofySDNx5zDvNoMRaakA5kwV/5Pa8lXQvojtSg=; b=dCYNif6SQhboCgCZl+VcbrrIMNDXEKIj7b84pkGxhTpkz9puWrZdUfY2ji9ICqbFBR JyifxyDeBEZcc0OUDheWQlBU+HL4tel/HO1ycdRM6ecwEK/wVk6+K5OzbnVaMQ1jYmqd Hlj5Y7L9aWbnNJoUhfZLnhAmcsPxPO4QZ7SDXvIXvJzXLBMVoK0D0twuXjuiDEbcSspJ +qC4T0UrpM9WpIDm/aJHucfxnLvK/0wOrznvHJpd6gOtyD9+l4wWzezA++MD8mNWw3sm ocTMRNVOBwQMlhvlY/jdGznwN6CAjF3AD36sjv0XUxNOn2yaayhv9F9lzhZgjr2kvc0K +ntw== X-Gm-Message-State: AOJu0Ywrt1NttOd990Y4YkGRo482XYA938APTkQa2nHF2BYa6uLbgPKD hDoQwJAtGLKUB1xcgGewGiYEVFDKqF8= X-Google-Smtp-Source: AGHT+IE6kCWIjiWrAocPsB1les5t/uU7U8mJWMLBrGhIfSzu66K+RczXzyPpU3J3yPu+hzHqfc1oyQ== X-Received: by 2002:a17:907:1b06:b0:9c3:d356:ad0c with SMTP id mp6-20020a1709071b0600b009c3d356ad0cmr4933365ejc.24.1699543242709; Thu, 09 Nov 2023 07:20:42 -0800 (PST) Received: from [192.168.1.95] (host-176-36-0-241.b024.la.net.ua. [176.36.0.241]) by smtp.gmail.com with ESMTPSA id y19-20020a17090668d300b00992f2befcbcsm2631720ejr.180.2023.11.09.07.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 07:20:41 -0800 (PST) Message-ID: <302fa765f09496c86a39881cc5397ec00e251dbe.camel@gmail.com> Subject: Re: [PATCH bpf-next 4/7] bpf: fix check for attempt to corrupt spilled pointer From: Eduard Zingerman To: Andrii Nakryiko , bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, martin.lau@kernel.org Cc: kernel-team@meta.com Date: Thu, 09 Nov 2023 17:20:40 +0200 In-Reply-To: <20231031050324.1107444-5-andrii@kernel.org> References: <20231031050324.1107444-1-andrii@kernel.org> <20231031050324.1107444-5-andrii@kernel.org> Autocrypt: addr=eddyz87@gmail.com; prefer-encrypt=mutual; keydata=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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.0 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Mon, 2023-10-30 at 22:03 -0700, Andrii Nakryiko wrote: > > When register is spilled onto a stack as a 1/2/4-byte register, we set > > slot_type[BPF_REG_SIZE - 1] (plus potentially few more below it, > > depending on actual spill size). So to check if some stack slot has > > spilled register we need to consult slot_type[7], not slot_type[0]. > >=20 > > To avoid the need to remember and double-check this in the future, just > > use is_spilled_reg() helper. > >=20 > > Fixes: 638f5b90d460 ("bpf: reduce verifier memory consumption") > > Signed-off-by: Andrii Nakryiko Acked-by: Eduard Zingerman > > --- > > kernel/bpf/verifier.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c > > index 098ba0e1a6ff..82992c32c1bd 100644 > > --- a/kernel/bpf/verifier.c > > +++ b/kernel/bpf/verifier.c > > @@ -4622,7 +4622,7 @@ static int check_stack_write_fixed_off(struct bpf= _verifier_env *env, > > * so it's aligned access and [off, off + size) are within stack limi= ts > > */ > > if (!env->allow_ptr_leaks && > > - state->stack[spi].slot_type[0] =3D=3D STACK_SPILL && > > + is_spilled_reg(&state->stack[spi]) && > > size !=3D BPF_REG_SIZE) { > > verbose(env, "attempt to corrupt spilled pointer on stack\n"); > > return -EACCES;