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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 807B8C32792 for ; Sat, 5 Oct 2019 05:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5839A222C0 for ; Sat, 5 Oct 2019 05:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570251848; bh=AmyOKaeem7opVurocSozXuL9PAecGgXGGmtzNo/vQFU=; h=From:To:CC:Subject:Date:In-Reply-To:References:List-ID:From; b=gzH3z2oQ0V+JcHjpE+D7vg8dBgfBbjABFXC8AJB9KfAGEXnDVFhj7vJh49LDCEP/6 ytaBX8TdKk4/9Ttm0toGEoz3j3dHdULS0iRFKFxxiTAiEkYxWhNFrVjFF14PIsKujM 3iSoKPHgnGboWOOc41y+cZGonKnzvv9e447Jg1M8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727212AbfJEFEI convert rfc822-to-8bit (ORCPT ); Sat, 5 Oct 2019 01:04:08 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:10592 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727137AbfJEFEH (ORCPT ); Sat, 5 Oct 2019 01:04:07 -0400 Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x95542HA007617 for ; Fri, 4 Oct 2019 22:04:06 -0700 Received: from mail.thefacebook.com (mailout.thefacebook.com [199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2ve79tbkqk-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 04 Oct 2019 22:04:06 -0700 Received: from 2401:db00:2120:81ca:face:0:31:0 (2620:10d:c081:10::13) by mail.thefacebook.com (2620:10d:c081:35::125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5; Fri, 4 Oct 2019 22:03:33 -0700 Received: by devbig007.ftw2.facebook.com (Postfix, from userid 572438) id 4433776091D; Fri, 4 Oct 2019 22:03:33 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Alexei Starovoitov Smtp-Origin-Hostname: devbig007.ftw2.facebook.com To: CC: , , , , Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next 09/10] bpf: disallow bpf_probe_read[_str] helpers Date: Fri, 4 Oct 2019 22:03:13 -0700 Message-ID: <20191005050314.1114330-10-ast@kernel.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191005050314.1114330-1-ast@kernel.org> References: <20191005050314.1114330-1-ast@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-05_02:2019-10-03,2019-10-05 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 bulkscore=0 mlxscore=0 impostorscore=0 phishscore=0 suspectscore=1 spamscore=0 malwarescore=0 clxscore=1015 mlxlogscore=826 priorityscore=1501 adultscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1908290000 definitions=main-1910050045 X-FB-Internal: deliver Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Disallow bpf_probe_read() and bpf_probe_read_str() helpers in raw_tracepoint bpf programs that use in-kernel BTF to track types of memory accesses. Signed-off-by: Alexei Starovoitov --- kernel/trace/bpf_trace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 52f7e9d8c29b..7c607f79f1bb 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -700,6 +700,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_map_peek_elem: return &bpf_map_peek_elem_proto; case BPF_FUNC_probe_read: + if (prog->expected_attach_type) + return NULL; return &bpf_probe_read_proto; case BPF_FUNC_ktime_get_ns: return &bpf_ktime_get_ns_proto; @@ -728,6 +730,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_get_prandom_u32: return &bpf_get_prandom_u32_proto; case BPF_FUNC_probe_read_str: + if (prog->expected_attach_type) + return NULL; return &bpf_probe_read_str_proto; #ifdef CONFIG_CGROUPS case BPF_FUNC_get_current_cgroup_id: -- 2.20.0