Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Fri, 27 Oct 2023 15:44:10 +0800
From:   Shung-Hsi Yu <shung-hsi.yu@suse.com>
To:     Hao Sun <sunhao.th@gmail.com>
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        John Fastabend <john.fastabend@gmail.com>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>,
        Yonghong Song <yonghong.song@linux.dev>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>,
        Eduard Zingerman <eddyz87@gmail.com>, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH bpf-next 1/2] bpf: Fix check_stack_write_fixed_off() to
 correctly spill imm
Message-ID: <ZTtqSnKmaQ4ma98g@u94a>
References: <20231026-fix-check-stack-write-v1-0-6b325ef3ce7e@gmail.com>
 <20231026-fix-check-stack-write-v1-1-6b325ef3ce7e@gmail.com>
 <ZTtjQlqRQWCWwmHx@u94a>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <ZTtjQlqRQWCWwmHx@u94a>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MElKQlJzMkt1cGNsMHh4cWVBWnRjWE9jamd0NnJsS2NMM2FEd2dxV0Nuc1ZQ?=
 =?utf-8?B?Z291cndLYnBCODJPY1NWRjBYaFJCVDlqRVo2bFpvS0drNkJ1dTdHSEREeW93?=
 =?utf-8?B?czQrWWUrWmpHYzhIUG9rVFA5QVhsdHgxdmNRakhqbTVwcTJuWXprNXhNUHRo?=
 =?utf-8?B?bGFrL3R1cGFyZkk5VnZUM2NqZ2JMd3B2UzhJaTNGR2htMkhlUTMwa1lFN3Zs?=
 =?utf-8?B?OXlmdXdGM1dEV2NuT0RkR29LZ25WSlpBbHk0UjZTTTZMeEZTWHlURzkyc0s4?=
 =?utf-8?B?VzBwV2R4UENqWTd3VDYzRS84K1ZlcGk1NzNUY1VDTEdaejQxUjBxM3RFRFpT?=
 =?utf-8?B?T0MxNGpWT0xBK2RKZG9DbHZLRXdCbFVRK1JmOEdhd01Yd2tNMDdQRDc5alJM?=
 =?utf-8?B?L2N6MHh5em1OL05RL3hVZDBTdUszVTFCejFPVzBsYWxHZDY3eGQ5bTRPcFhU?=
 =?utf-8?B?eVErU1NhcnNSTDJseFRQUTJxNHF3UEI5Rms2RFh2RVc3aTQzQ0VkK0VMYzFu?=
 =?utf-8?B?R0I2THZOcmJPNUU1UDZ1M1NIZzV3b2ZqU3pvZm5DRldDMmNjREFTdERKd1lx?=
 =?utf-8?B?UE54WktDTFNMK2EzUlFuV2ZEcDZHcU4zSDBFeWh2cWpQcUFlZEtUcjZ2S1Bl?=
 =?utf-8?B?MjMxdzFuNWJ2TFRZY2o2eXpEWDFzMDZVNkJjT2Z0QXgyT1NGVy96V3l1bXcw?=
 =?utf-8?B?Zndva2tJSU4rcnFPS1VLcXZ3R0o1Y0huVnMwMEptbzlKTm1RRG41YTgxeE5S?=
 =?utf-8?B?TFp1UmoxZVZ2Nm5ldnFoVHFzZG5PZDdkaTlvYUJoaGNzaEYwWVo5L0NySW9l?=
 =?utf-8?B?OUZsK25tQTFMU3pTbDB2dElBZnl4Z1NXTGVCempvOFdBN3lEb3duUExSL25s?=
 =?utf-8?B?b1lFUTV3YmNsaTdmVWlIaWtGOXhFWXpkSHpNK0RtWFpyZm9nUjZ1MU9wb2d2?=
 =?utf-8?B?eE16TlErMGlFODZldytiZDBaajhHMnRGRUw4LzR3T0ZjOUlOTzltaHRxN3NW?=
 =?utf-8?B?VnQ3QTJsUGpYNE56bEhjcklyeTlBbjVwQ3BDbzFBZndKTTdiQzV4dktlMGVw?=
 =?utf-8?B?ODNZN0YzbW1Jd040RzFrMmh6Z1hodFhFcmg1UUg4N0wxSkRyY09jODJ6SDh3?=
 =?utf-8?B?WUhXYmhOeUdGcXdnRUR6RnNrZlNacHlGNU8yMmw5b2RmcmxlK0k0cTMzMXJQ?=
 =?utf-8?B?N3gxcFRCN3ZiVXd4MjNTbGFlVVVxbTJIUHNvZFM5L2JLR3Q4Y0MvTnRMVnU5?=
 =?utf-8?B?R3F1NEhUeGxLdkpjcW9PamFlUkw2OUIwSjNRR2YwRlZWVllOTy9zZlNqeWx6?=
 =?utf-8?B?ZzdoMVNtWUcxYW9ZR1VXWkMzMm1ybzFFQ3NaWTBsWFpva0dQcUlNN1ZVVWxv?=
 =?utf-8?B?NUtXQkg3dGVBdUxLNFM1dWM4TWNPRWdObmxvaHhiTGtBTmsyZnF4MU1lM0tp?=
 =?utf-8?B?SkEyODZCanFYWHRyWlNsVmtLUzBlSlpRRlgrR0hTbENVbWQvNnY2bTFOb1Z0?=
 =?utf-8?B?bUZOUkZuUlBSVzY1NWppNlFuOUpjWG84MDhCbGxmS2dQSGFvT1A4NFF4L1Zl?=
 =?utf-8?B?bUZRL0dKOGxpVzhldHhrbXFwSXR1QStuWXVsZnhNbHNmN29wTkVnMTlXMFJ6?=
 =?utf-8?B?TGkwVXQ0S1M5Z2JKNmljRmxFeUFmVlJ2aUZNZzl3ckI2aURJb0h2Y2VmdlJo?=
 =?utf-8?B?WXc3aEhBSEpuTmVzZ2xSRE11WWt6L3lJM1FkRWRPb3pwNkx1ZHlNUG1Ja2dM?=
 =?utf-8?B?Z2xmWDZFR1N0T0RXeFVlMXoxRWt5Y0hFQXNhRDRmTVlIQ1k3eGtUWm90WmQ4?=
 =?utf-8?B?MDBjc2xRM0NKQWZhQ3lTcHhXSmRGYVJaM1drQ3pCMVBXMGVDeU1PaGtVT0dt?=
 =?utf-8?B?elVKZTBIN0RseDN6TUZ0MlZBODA4b0pRMElYelo3Wi9FTFN4OEJOU1VFVmJi?=
 =?utf-8?B?Z3dFVXl4WW0rRW1sYjNTNlFEUURWQ2ZTckd1a0tHdWJDL0Vpd2NyWU1kNExK?=
 =?utf-8?B?bkRaZnZVaXhMQU1tUFgyR1BiTHc4RDB3YXZMS0JaYkJicWUyU2NaSzZySVY2?=
 =?utf-8?B?TVlybkZzTEZyN3NsRkI0SW91bU1Ic0NCMGk2NFh2Zk9yTmVQSmZRQXMvZG9p?=
 =?utf-8?Q?1ftjTNze83HDLkMbHZu2uachE?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cf795705-2e3c-4c43-a5b2-08dbd6c086de
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9510.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 07:44:18.8543
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2KgMMq8ComNhgllEF23zWdTumemrN6tpUusMjtMc6AARpbgnmGxvIG/Wv9s4JZd6Ctfot5GuOAdOLhiEPHpREA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9517
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 27 Oct 2023 00:44:44 -0700 (PDT)

On Fri, Oct 27, 2023 at 03:14:10PM +0800, Shung-Hsi Yu wrote:
> On Thu, Oct 26, 2023 at 05:13:10PM +0200, Hao Sun wrote:
> > In check_stack_write_fixed_off(), imm value is cast to u32 before being
> > spilled to the stack. Therefore, the sign information is lost, and the
> > range information is incorrect when load from the stack again.
> > 
> > For the following prog:
> > 0: r2 = r10
> > 1: *(u64*)(r2 -40) = -44
> > 2: r0 = *(u64*)(r2 - 40)
> > 3: if r0 s<= 0xa goto +2
> > 4: r0 = 1
> > 5: exit
> > 6: r0  = 0
> > 7: exit
> > 
> > The verifier gives:
> > func#0 @0
> > 0: R1=ctx(off=0,imm=0) R10=fp0
> > 0: (bf) r2 = r10                      ; R2_w=fp0 R10=fp0
> > 1: (7a) *(u64 *)(r2 -40) = -44        ; R2_w=fp0 fp-40_w=4294967252
> > 2: (79) r0 = *(u64 *)(r2 -40)         ; R0_w=4294967252 R2_w=fp0
> > fp-40_w=4294967252
> > 3: (c5) if r0 s< 0xa goto pc+2
> > mark_precise: frame0: last_idx 3 first_idx 0 subseq_idx -1
> > mark_precise: frame0: regs=r0 stack= before 2: (79) r0 = *(u64 *)(r2 -40)
> > 3: R0_w=4294967252
> > 4: (b7) r0 = 1                        ; R0_w=1
> > 5: (95) exit
> > verification time 7971 usec
> > stack depth 40
> > processed 6 insns (limit 1000000) max_states_per_insn 0 total_states 0
> > peak_states 0 mark_read 0
> > 
> > So remove the incorrect cast, since imm field is declared as s32, and
> > __mark_reg_known() takes u64, so imm would be correctly sign extended
> > by compiler.
> > 
> > Signed-off-by: Hao Sun <sunhao.th@gmail.com>
> 
> Acked-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
> 
> The acked-by applies to future version of the patchset as well.

Oh and since this is a fix it would be great to have the fixes tag[1] to
specify when the bug was introduced

Fixes: ecdf985d7615 ("bpf: track immediate values written to stack by BPF_ST instruction")

Add Cc tag for stable[2] so stable kernels pick up the fix as well

Cc: stable@vger.kernel.org

And ideally specify that the patch should be applied to the bpf tree rather
than bpf-next[3] (though the BPF maintainers has the final say on which tree
this patch should be applied).

I'd owe you a big thank as well since this helps with our internal process
at my company. So thank you in advance!

1: https://docs.kernel.org/process/submitting-patches.html#describe-your-changes
2: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
3: https://docs.kernel.org/bpf/bpf_devel_QA.html#q-how-do-the-changes-make-their-way-into-linux

> FWIW I think we'd also need the same treatment for the (BPF_ALU | BPF_MOV |
> BPF_K) case in check_alu_op().
> 
> > ---
> >  kernel/bpf/verifier.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> > index 857d76694517..44af69ce1301 100644
> > --- a/kernel/bpf/verifier.c
> > +++ b/kernel/bpf/verifier.c
> > @@ -4674,7 +4674,7 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env,
> >  		   insn->imm != 0 && env->bpf_capable) {
> >  		struct bpf_reg_state fake_reg = {};
> >  
> > -		__mark_reg_known(&fake_reg, (u32)insn->imm);
> > +		__mark_reg_known(&fake_reg, insn->imm);
> >  		fake_reg.type = SCALAR_VALUE;
> >  		save_register_state(state, spi, &fake_reg, size);
> >  	} else if (reg && is_spillable_regtype(reg->type)) {
> > 
> > -- 
> > 2.34.1
> >