From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (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 A4CAB548E7 for ; Fri, 15 Mar 2024 21:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710537128; cv=none; b=LrMxtRU7BOSlbKMTTqIipwO0sOWSqoj2toDTFXV3MHCg6eOM8AO17rAq65ORcaFP8vXPnRLbLqqgoMm8z1yT70G7YXkaFgzhm1B3SoX+YIiPEKa9ZGyH4whkm3xh/2LQ551nNdh+/l0GtIWv175rm80KW3MjlR/lFWKxthuR3xM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710537128; c=relaxed/simple; bh=n/ul0ogx7iwzi5n9hjSGc4kclaFxVnfk7TjW0NiHHcU=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=Emi2+l2mHezkK2UdIbhtxs7TbyuMNsIUPiWLv/nkXX+zDwMwkiOXtvrkqifT4zfLmVUKNhrfbSXyCvQAFS0noRgWUD6IufVkVzGNV13/uOvCY4O1YFP6wu6vONvGGhG+0UVKpJzPoXXu8lJMixbU3L26xT8ea1Li74Ho2pRn/yc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=t4qE5XXz; arc=none smtp.client-ip=95.215.58.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="t4qE5XXz" Message-ID: <5f450439-3400-45cb-bb62-4559bd6e088e@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1710537124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xOAHpfzXDspbl58UkIknw9ZqxHAdHjN22/pRm7dUv/A=; b=t4qE5XXzsRE50gGpMBjUHqk5Bu4EZG4MzUQBEyCuL5dXlhgz0ShnsZPiF6CtWiV+W1m7xj M2yCNnU7rX1uVEIErJHuaNgglF/wVvku1w7OW6Ye7fMWu320FPJZjouURI7uFEu2Sbw/6T qXnUkC8vJnpGnHHnnsupyN0I6GBMr1U= Date: Fri, 15 Mar 2024 14:11:51 -0700 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v3 2/2] bpf: Check return from set_memory_rox() Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau To: Christophe Leroy Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Zi Shen Lim , Catalin Marinas , Will Deacon , "David S. Miller" , David Ahern , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Kui-Feng Lee , Eric Dumazet , Jakub Kicinski , Paolo Abeni , bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Kees Cook References: <2b9fdb119ef73cfa4516572026ba4936e86aedca.1710522112.git.christophe.leroy@csgroup.eu> <4d7cc25e937403ac61ae61be06f998f27e631a65.1710522112.git.christophe.leroy@csgroup.eu> <55151dc9-8edf-4c75-b1d0-1cc0437816c3@linux.dev> In-Reply-To: <55151dc9-8edf-4c75-b1d0-1cc0437816c3@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 3/15/24 1:55 PM, Martin KaFai Lau wrote: > On 3/15/24 10:06 AM, Christophe Leroy wrote: >> diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c >> index 43356faaa057..ca1d9b87c475 100644 >> --- a/kernel/bpf/bpf_struct_ops.c >> +++ b/kernel/bpf/bpf_struct_ops.c >> @@ -742,8 +742,11 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map >> *map, void *key, >>           if (err) >>               goto reset_unlock; >>       } >> -    for (i = 0; i < st_map->image_pages_cnt; i++) >> -        arch_protect_bpf_trampoline(st_map->image_pages[i], PAGE_SIZE); >> +    for (i = 0; i < st_map->image_pages_cnt && !err; i++) >> +        err = arch_protect_bpf_trampoline(st_map->image_pages[i], PAGE_SIZE); >> + >> +    if (err) >> +        goto reset_unlock; > > This part does not look right. The "if (err)" check should be inside the for loop. ah. Please ignore. missed the "!err" in the for loop. 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 85A7DC54E67 for ; Fri, 15 Mar 2024 21:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vRLOjytH/L5prhc2n/Q+QGT2bcInyJTW32/gYHdlFsA=; b=g2k5VnozUqfCK/ iEPGJFLv/ugrH4LQKuzT9jgQvFSakoi+3SIpxQq7JM/jMOYNBl082EoLL0WjfUyz+noBTg5aZWVeT jHu0afFFiw9VPKTS2g13DJafPmS8MtiVii+3uEQCZZm3gad5BjDnkp2HNi4jTTbPnmNNczoEfZmAL +yy7BaUJqMYqxBSc9VYbsrGS1/ubEJpbvb2t1HDTOsPqCNwCAGNmkH/hDkWINIaZV64/YXeD85kBw YHgBFNGq+vS/x94rE39xSJiu9i+1mWsxJ1DnFcbfdU699I0FEzKV0B5Gr4GfV+fB+NCquum9OWVMR JkydKKGpLbq1yAsawAWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rlEqg-00000001bXg-0XQS; Fri, 15 Mar 2024 21:12:18 +0000 Received: from out-171.mta1.migadu.com ([95.215.58.171]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rlEqa-00000001bVj-1qoN for linux-arm-kernel@lists.infradead.org; Fri, 15 Mar 2024 21:12:16 +0000 Message-ID: <5f450439-3400-45cb-bb62-4559bd6e088e@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1710537124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xOAHpfzXDspbl58UkIknw9ZqxHAdHjN22/pRm7dUv/A=; b=t4qE5XXzsRE50gGpMBjUHqk5Bu4EZG4MzUQBEyCuL5dXlhgz0ShnsZPiF6CtWiV+W1m7xj M2yCNnU7rX1uVEIErJHuaNgglF/wVvku1w7OW6Ye7fMWu320FPJZjouURI7uFEu2Sbw/6T qXnUkC8vJnpGnHHnnsupyN0I6GBMr1U= Date: Fri, 15 Mar 2024 14:11:51 -0700 MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v3 2/2] bpf: Check return from set_memory_rox() Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau To: Christophe Leroy Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Zi Shen Lim , Catalin Marinas , Will Deacon , "David S. Miller" , David Ahern , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Kui-Feng Lee , Eric Dumazet , Jakub Kicinski , Paolo Abeni , bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Kees Cook References: <2b9fdb119ef73cfa4516572026ba4936e86aedca.1710522112.git.christophe.leroy@csgroup.eu> <4d7cc25e937403ac61ae61be06f998f27e631a65.1710522112.git.christophe.leroy@csgroup.eu> <55151dc9-8edf-4c75-b1d0-1cc0437816c3@linux.dev> In-Reply-To: <55151dc9-8edf-4c75-b1d0-1cc0437816c3@linux.dev> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240315_141212_721064_6C7817F2 X-CRM114-Status: GOOD ( 11.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMy8xNS8yNCAxOjU1IFBNLCBNYXJ0aW4gS2FGYWkgTGF1IHdyb3RlOgo+IE9uIDMvMTUvMjQg MTA6MDYgQU0sIENocmlzdG9waGUgTGVyb3kgd3JvdGU6Cj4+IGRpZmYgLS1naXQgYS9rZXJuZWwv YnBmL2JwZl9zdHJ1Y3Rfb3BzLmMgYi9rZXJuZWwvYnBmL2JwZl9zdHJ1Y3Rfb3BzLmMKPj4gaW5k ZXggNDMzNTZmYWFhMDU3Li5jYTFkOWI4N2M0NzUgMTAwNjQ0Cj4+IC0tLSBhL2tlcm5lbC9icGYv YnBmX3N0cnVjdF9vcHMuYwo+PiArKysgYi9rZXJuZWwvYnBmL2JwZl9zdHJ1Y3Rfb3BzLmMKPj4g QEAgLTc0Miw4ICs3NDIsMTEgQEAgc3RhdGljIGxvbmcgYnBmX3N0cnVjdF9vcHNfbWFwX3VwZGF0 ZV9lbGVtKHN0cnVjdCBicGZfbWFwIAo+PiAqbWFwLCB2b2lkICprZXksCj4+IMKgwqDCoMKgwqDC oMKgwqDCoCBpZiAoZXJyKQo+PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBnb3RvIHJlc2V0 X3VubG9jazsKPj4gwqDCoMKgwqDCoCB9Cj4+IC3CoMKgwqAgZm9yIChpID0gMDsgaSA8IHN0X21h cC0+aW1hZ2VfcGFnZXNfY250OyBpKyspCj4+IC3CoMKgwqDCoMKgwqDCoCBhcmNoX3Byb3RlY3Rf YnBmX3RyYW1wb2xpbmUoc3RfbWFwLT5pbWFnZV9wYWdlc1tpXSwgUEFHRV9TSVpFKTsKPj4gK8Kg wqDCoCBmb3IgKGkgPSAwOyBpIDwgc3RfbWFwLT5pbWFnZV9wYWdlc19jbnQgJiYgIWVycjsgaSsr KQo+PiArwqDCoMKgwqDCoMKgwqAgZXJyID0gYXJjaF9wcm90ZWN0X2JwZl90cmFtcG9saW5lKHN0 X21hcC0+aW1hZ2VfcGFnZXNbaV0sIFBBR0VfU0laRSk7Cj4+ICsKPj4gK8KgwqDCoCBpZiAoZXJy KQo+PiArwqDCoMKgwqDCoMKgwqAgZ290byByZXNldF91bmxvY2s7Cj4gCj4gVGhpcyBwYXJ0IGRv ZXMgbm90IGxvb2sgcmlnaHQuIFRoZSAiaWYgKGVycikiIGNoZWNrIHNob3VsZCBiZSBpbnNpZGUg dGhlIGZvciBsb29wLgoKYWguIFBsZWFzZSBpZ25vcmUuIG1pc3NlZCB0aGUgIiFlcnIiIGluIHRo ZSBmb3IgbG9vcC4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMu aW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2xpbnV4LWFybS1rZXJuZWwK