From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (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 BBEE910FD; Sat, 16 Mar 2024 00:56:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710550599; cv=none; b=hgyUZvMUZSvOY7QMLz/XzRSjMbirLF+CHsDLcFvbX91GksF+0K3h9LSay1d1gmtcP1wb/GD6FKvjsZwC/3a73xw0iwutO/4+s0YKRmHrBxZ7AQY0Bu591nZ2dczaU3Ak8a5gPytDSFTq+JLteu7zhDIB9rcM+RUk9ixWWjtm1bA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710550599; c=relaxed/simple; bh=bPfFJhVHE2biA6KUtBwzGPzy4ZeiHLm2xIIVTFfgees=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=X7gVVmaoZBB2ZvuHIVrlgcPPPrAtvk9PYn02L7wvNauIUre51JA+a2CKQ+hS6xjlDr9xHx8ydpGRMuS9Dt/XjtgFkcTRpkv5NiEoNqIP8oZAz+7OcFqtiKO9nIjxGfsXB1a6NrnxtT7WcOBninxUvJP575iLIx6xIn6v7RLUhRE= 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=BH7hxmhU; arc=none smtp.client-ip=91.218.175.186 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="BH7hxmhU" Message-ID: <3ddb16ca-83b8-42dc-9c28-4527905e5fe3@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1710550595; 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=gPI3Clq/u50XsFhM58woftYSJqswXV/yKNjzVYbfKKU=; b=BH7hxmhUmfkNhC8dV/0vdk9tlDmosGsONe+WwzojsKS6Ku+LtEAwqvZ9s6Pp0JvEteNJF+ SMnWEKs+/te50m7J3C/gVXOoYZ1XMShmeUNJEOtTbTtkKo0z+OsSeokZEOEDB2x58ij+Cr Q3DpY2yzRt65b5dZAnxekGAxBHujrxk= Date: Fri, 15 Mar 2024 17:56:24 -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> <5f450439-3400-45cb-bb62-4559bd6e088e@linux.dev> In-Reply-To: <5f450439-3400-45cb-bb62-4559bd6e088e@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 3/15/24 2:11 PM, Martin KaFai Lau wrote: > 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++) I was about to apply but I still think checking "&& !err" is not right given how "err" is used in the earlier code of this function. The err may not be 0 in the first iteration of this for loop. Take a look at the "if (err > 0)" check in the "for_each_member(i, t, member)" loop above. >>> +        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. Instead of adding an extra "err = 0;" before the for loop. It is better to move this "if (err) goto reset_unlock;" into the for loop and remove the "&& !err" test above. > > 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 C4DA1C54E67 for ; Sat, 16 Mar 2024 00:57:11 +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=x0Lch9LmV8kcdWWbakKknzaAaKOTIHruz9HkWOeps5E=; b=zOJJ0GL0adoXay dg+5Yk6aDDh/xK90KzwhQZk5AXi1JKcIjHfGQvmr6Pkdjf09WwtY8pnBC8cwcu8O/iSyID0kquySh ZH5vRiqCtdRmTZWWmQfKwqgvLBnShJv0ehSpWz6M6RaXsQSWdflXYHzoM5jGim1EEIH1Oks2Afm4S 2loPaxISNhHRvTFZMtQPwFEXKZOY9Nu5LIb7+v7/CEi6WNAZfxXU6Wy0+WbS0+QkKrjVcI4lQURFp sasYCFsJeEUlGmrAodrewQj0qCUvQHEVqISwGwBHAPW9f3qkDeVD5RwsdrKHmdDBDGnXwDThrGo9s L1xLmBuGgljnzKe1buIw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rlILw-00000001zrd-3gSE; Sat, 16 Mar 2024 00:56:48 +0000 Received: from out-188.mta0.migadu.com ([91.218.175.188]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rlILq-00000001zq5-35UZ for linux-arm-kernel@lists.infradead.org; Sat, 16 Mar 2024 00:56:47 +0000 Message-ID: <3ddb16ca-83b8-42dc-9c28-4527905e5fe3@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1710550595; 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=gPI3Clq/u50XsFhM58woftYSJqswXV/yKNjzVYbfKKU=; b=BH7hxmhUmfkNhC8dV/0vdk9tlDmosGsONe+WwzojsKS6Ku+LtEAwqvZ9s6Pp0JvEteNJF+ SMnWEKs+/te50m7J3C/gVXOoYZ1XMShmeUNJEOtTbTtkKo0z+OsSeokZEOEDB2x58ij+Cr Q3DpY2yzRt65b5dZAnxekGAxBHujrxk= Date: Fri, 15 Mar 2024 17:56:24 -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> <5f450439-3400-45cb-bb62-4559bd6e088e@linux.dev> In-Reply-To: <5f450439-3400-45cb-bb62-4559bd6e088e@linux.dev> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240315_175643_157744_8ABE9CDE X-CRM114-Status: GOOD ( 13.58 ) 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 T24gMy8xNS8yNCAyOjExIFBNLCBNYXJ0aW4gS2FGYWkgTGF1IHdyb3RlOgo+IE9uIDMvMTUvMjQg MTo1NSBQTSwgTWFydGluIEthRmFpIExhdSB3cm90ZToKPj4gT24gMy8xNS8yNCAxMDowNiBBTSwg Q2hyaXN0b3BoZSBMZXJveSB3cm90ZToKPj4+IGRpZmYgLS1naXQgYS9rZXJuZWwvYnBmL2JwZl9z dHJ1Y3Rfb3BzLmMgYi9rZXJuZWwvYnBmL2JwZl9zdHJ1Y3Rfb3BzLmMKPj4+IGluZGV4IDQzMzU2 ZmFhYTA1Ny4uY2ExZDliODdjNDc1IDEwMDY0NAo+Pj4gLS0tIGEva2VybmVsL2JwZi9icGZfc3Ry dWN0X29wcy5jCj4+PiArKysgYi9rZXJuZWwvYnBmL2JwZl9zdHJ1Y3Rfb3BzLmMKPj4+IEBAIC03 NDIsOCArNzQyLDExIEBAIHN0YXRpYyBsb25nIGJwZl9zdHJ1Y3Rfb3BzX21hcF91cGRhdGVfZWxl bShzdHJ1Y3QgCj4+PiBicGZfbWFwICptYXAsIHZvaWQgKmtleSwKPj4+IMKgwqDCoMKgwqDCoMKg wqDCoCBpZiAoZXJyKQo+Pj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgZ290byByZXNldF91 bmxvY2s7Cj4+PiDCoMKgwqDCoMKgIH0KPj4+IC3CoMKgwqAgZm9yIChpID0gMDsgaSA8IHN0X21h cC0+aW1hZ2VfcGFnZXNfY250OyBpKyspCj4+PiAtwqDCoMKgwqDCoMKgwqAgYXJjaF9wcm90ZWN0 X2JwZl90cmFtcG9saW5lKHN0X21hcC0+aW1hZ2VfcGFnZXNbaV0sIFBBR0VfU0laRSk7Cj4+PiAr wqDCoMKgIGZvciAoaSA9IDA7IGkgPCBzdF9tYXAtPmltYWdlX3BhZ2VzX2NudCAmJiAhZXJyOyBp KyspCgpJIHdhcyBhYm91dCB0byBhcHBseSBidXQgSSBzdGlsbCB0aGluayBjaGVja2luZyAiJiYg IWVyciIgaXMgbm90IHJpZ2h0IGdpdmVuIGhvdyAKImVyciIgaXMgdXNlZCBpbiB0aGUgZWFybGll ciBjb2RlIG9mIHRoaXMgZnVuY3Rpb24uCgpUaGUgZXJyIG1heSBub3QgYmUgMCBpbiB0aGUgZmly c3QgaXRlcmF0aW9uIG9mIHRoaXMgZm9yIGxvb3AuIFRha2UgYSBsb29rIGF0IHRoZSAKImlmIChl cnIgPiAwKSIgY2hlY2sgaW4gdGhlICJmb3JfZWFjaF9tZW1iZXIoaSwgdCwgbWVtYmVyKSIgbG9v cCBhYm92ZS4KCj4+PiArwqDCoMKgwqDCoMKgwqAgZXJyID0gYXJjaF9wcm90ZWN0X2JwZl90cmFt cG9saW5lKHN0X21hcC0+aW1hZ2VfcGFnZXNbaV0sIFBBR0VfU0laRSk7Cj4+PiArCj4+PiArwqDC oMKgIGlmIChlcnIpCj4+PiArwqDCoMKgwqDCoMKgwqAgZ290byByZXNldF91bmxvY2s7Cj4+Cj4+ IFRoaXMgcGFydCBkb2VzIG5vdCBsb29rIHJpZ2h0LiBUaGUgImlmIChlcnIpIiBjaGVjayBzaG91 bGQgYmUgaW5zaWRlIHRoZSBmb3IgCj4+IGxvb3AuCgpJbnN0ZWFkIG9mIGFkZGluZyBhbiBleHRy YSAiZXJyID0gMDsiIGJlZm9yZSB0aGUgZm9yIGxvb3AuIEl0IGlzIGJldHRlciB0byBtb3ZlIAp0 aGlzICJpZiAoZXJyKSBnb3RvIHJlc2V0X3VubG9jazsiIGludG8gdGhlIGZvciBsb29wIGFuZCBy ZW1vdmUgdGhlICImJiAhZXJyIiAKdGVzdCBhYm92ZS4KCj4gCj4gYWguIFBsZWFzZSBpZ25vcmUu IG1pc3NlZCB0aGUgIiFlcnIiIGluIHRoZSBmb3IgbG9vcC4KCgoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBs aXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5m cmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK