Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1206946rdb; Mon, 19 Feb 2024 07:35:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUQqltHs+lUIFGn/ezRCzaR5NlwBMpiESCofd3r4XjlIJPTRy2BXrHPF5Pmqxtl2tzoJGvF0VtvYX7nG3NT2+y2RVt43nJMaizxkv+dXQ== X-Google-Smtp-Source: AGHT+IHNDEIWxGjXfnQCHBX8K+XCgRBnwaCxOQgDMj5ataLvX8UaqnIQsGKYJ4S4XaOB+cr0BSdO X-Received: by 2002:aa7:dcc4:0:b0:564:acf1:4d29 with SMTP id w4-20020aa7dcc4000000b00564acf14d29mr400013edu.32.1708356926706; Mon, 19 Feb 2024 07:35:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708356926; cv=pass; d=google.com; s=arc-20160816; b=hpwC2raJy2N+/8Zn6vCFL7stJrljbUGSOZoFqQGpENmjKIpM2oiueNdvWQESMLwCbr 1QDj0Fqu4j6kWHf1q4xNHmHsuMzO61APa92vGdlqw31HZShavQ/udsUCkHXgOEUHcCo0 gIMFfJ+Y396CBGrcvv5GwGzIOct3VsS70rlsoAO0jBaxRZmpXWAXg826PlGw43+/4k2L axXb38VsZiI2x+nGnl6NlFKgQC+pJItTOSuAUEH4Y54+yJ2R158WRD6YJIWHa3kUWQ/l RAjtMCPASBUc3dw1R6nybb/TxIkAlZ7dq940s/BWg/MSjh9bKLMcWkVvfhg3zfbYQ0Ew //7Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :user-agent:content-transfer-encoding:references:in-reply-to:date:cc :to:from:subject:message-id:dkim-signature; bh=T0e8ZFc3HV5eBAy00h0ivxaRla4eT9eTAKF3wMIZvmY=; fh=BNMAYZqYG5V3hkLlnZA3vHr1jwvdK5k6Ac51fCZTseQ=; b=TxIG4mUujujKeWd7t61vDjgHWIka5eTujAhaWhGFeFmbOGb3YaLjYFw7+AFrc0L5/r ikEK/+oXneAW4CLtHr+5FRyXcrec9rjYP8JSRVoGnxe1uRZE+nlT7TGvVZGlj82rZfIw 7YICmbgRrIiVwIeYlPNOgk0TcdPDJuaaumd+suUv/km9kNT5Oj39MtGTd+SIvQWnTllB LZrqqeYSW8hyHa/oOGRWIoGbHEV9Ih4YRY6OwKFkqEqzncOSFwPc3V1b7GFcUSsjvuLj e62b8OT8Qpc7pyrCBmJYVejvtfCwIP2wojnJikf0zFniyACOtXz9fXcDeU68vpDDvKcB 5G6A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=OWVBcK7j; arc=pass (i=1 spf=pass spfdomain=linux.ibm.com dkim=pass dkdomain=ibm.com dmarc=pass fromdomain=linux.ibm.com); spf=pass (google.com: domain of linux-kernel+bounces-71591-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71591-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id cq19-20020a056402221300b005620158b65bsi2518160edb.292.2024.02.19.07.35.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:35:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71591-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=OWVBcK7j; arc=pass (i=1 spf=pass spfdomain=linux.ibm.com dkim=pass dkdomain=ibm.com dmarc=pass fromdomain=linux.ibm.com); spf=pass (google.com: domain of linux-kernel+bounces-71591-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71591-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 1C4AC1F22A53 for ; Mon, 19 Feb 2024 15:35:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AC4363A297; Mon, 19 Feb 2024 15:35:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="OWVBcK7j" Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 1E321383A6; Mon, 19 Feb 2024 15:35:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708356903; cv=none; b=bPaqxiJFt80oRb1zKOxz/+7xqzWun5x6Do+NOhxUk35NB35brqMXdt8A1sAWs/MqAnVwfMgCeusUBDAr7fSqCBfWEpw5LDPxUxmxasepX3EzgIJ+nJhG3Vnlnh1eiiwYmCR4RFz/wKJtxljVOaxGOQza4LT0R4e/WPfW2ZndoGk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708356903; c=relaxed/simple; bh=wx8UZpkWB55VrmVZn+PIeRREueg/WVQO+NB1kQsXNLg=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=qznhUnVMIQIzD6dNxp+aPLxdB9YnUdrid9x7ebGNaNUwlMI4DpX33wO8XvOyxarqKdhPSpvCzU6PzLmNLeqk0/v+DBn19OmDmVOp+cf/sk85IJibIz3q7nEk3IvPTOaJORn1o2HEVAGEVuzdTNodXmv++y4//wnGEFwDN+Km94Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=OWVBcK7j; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41JFKlbC006461; Mon, 19 Feb 2024 15:33:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=pp1; bh=T0e8ZFc3HV5eBAy00h0ivxaRla4eT9eTAKF3wMIZvmY=; b=OWVBcK7j66OefOnldfIzP7QCMhMkvfXX49U1qwWLHciyoAtt5yG3w15/ro32CjhNzuv/ 561kb8L6+7SvjndVy3Zik1AfLwnLeK435nzfAU8pLAYOuxF43kkaXdzv6fhb7ZCcKO+p nG+qYTQ7fJKL/vcBNDFEevXTP/7lyRp71FcnBD8Sy2F0UDN5WZz+J/ocf7QYcfud6UFv ah5LG7QyuhDw9/52rtceHNlCyZBrsSQusd21pzOEVjA5B7RCSGUJexCj2m+ikRd0+U2E kJmLaQRWUywfuCw3ucDmtcyeIV2BP6wVIwJWuKyzatYNNuefQfe+B8x9tCy9LOi8qr4L Hg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wbdgwnbjd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Feb 2024 15:33:49 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 41JFLb8F008437; Mon, 19 Feb 2024 15:33:47 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wbdgwnb6e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Feb 2024 15:33:47 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 41JEjmF0017278; Mon, 19 Feb 2024 15:33:40 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3wb8mm1vb0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Feb 2024 15:33:40 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 41JFXYuB11534896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 19 Feb 2024 15:33:36 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 929232004B; Mon, 19 Feb 2024 15:33:34 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E93220049; Mon, 19 Feb 2024 15:33:33 +0000 (GMT) Received: from [9.155.200.166] (unknown [9.155.200.166]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 19 Feb 2024 15:33:33 +0000 (GMT) Message-ID: Subject: Re: [PATCH bpf-next 2/2] bpf: Take return from set_memory_rox() into account with bpf_jit_binary_lock_ro() From: Ilya Leoshkevich To: Christophe Leroy , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Russell King , Puranjay Mohan , Zi Shen Lim , Catalin Marinas , Will Deacon , Tiezhu Yang , Hengqi Chen , Huacai Chen , WANG Xuerui , Johan Almbladh , Paul Burton , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "David S. Miller" , Andreas Larsson , Wang YanQing , David Ahern , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Cc: bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, netdev@vger.kernel.org, Kees Cook , "linux-hardening @ vger . kernel . org" Date: Mon, 19 Feb 2024 16:33:33 +0100 In-Reply-To: References: <135feeafe6fe8d412e90865622e9601403c42be5.1708253445.git.christophe.leroy@csgroup.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 (3.50.3-1.fc39) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: oAChKg23BdNBTZrcSP06tgBD6BxLsz0g X-Proofpoint-ORIG-GUID: pcDzFPwvseJ0VbrYr5hrpvU0P_mie-dV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-19_11,2024-02-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 mlxlogscore=767 lowpriorityscore=0 adultscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402190116 On Sun, 2024-02-18 at 11:55 +0100, Christophe Leroy wrote: > set_memory_rox() can fail, leaving memory unprotected. >=20 > Check return and bail out when bpf_jit_binary_lock_ro() returns > and error. >=20 > Signed-off-by: Christophe Leroy > --- > Previous patch introduces a dependency on this patch because it > modifies bpf_prog_lock_ro(), but they are independant. > It is possible to apply this patch as standalone by handling trivial > conflict with unmodified bpf_prog_lock_ro(). > --- > =C2=A0arch/arm/net/bpf_jit_32.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= | 25 ++++++++++++------------- > =C2=A0arch/arm64/net/bpf_jit_comp.c=C2=A0=C2=A0=C2=A0 | 21 ++++++++++++++= +------ > =C2=A0arch/loongarch/net/bpf_jit.c=C2=A0=C2=A0=C2=A0=C2=A0 | 21 +++++++++= ++++++------ > =C2=A0arch/mips/net/bpf_jit_comp.c=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 ++- > =C2=A0arch/parisc/net/bpf_jit_core.c=C2=A0=C2=A0 |=C2=A0 8 +++++++- > =C2=A0arch/s390/net/bpf_jit_comp.c=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 6 ++++= +- > =C2=A0arch/sparc/net/bpf_jit_comp_64.c |=C2=A0 6 +++++- > =C2=A0arch/x86/net/bpf_jit_comp32.c=C2=A0=C2=A0=C2=A0 |=C2=A0 3 +-- > =C2=A0include/linux/filter.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 |=C2=A0 4 ++-- > =C2=A09 files changed, 64 insertions(+), 33 deletions(-) Reviewed-by: Ilya Leoshkevich # s390x