Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3354316iob; Mon, 16 May 2022 20:28:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDEYVTR2e7Ecfq12R+u/GR8nmkN6uVGaTNWr02OHlSj5/Ov+pBygk34NGfRyjIsgCnwrD1 X-Received: by 2002:a17:907:2146:b0:6f5:28b5:5f38 with SMTP id rk6-20020a170907214600b006f528b55f38mr17602563ejb.118.1652758087240; Mon, 16 May 2022 20:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652758087; cv=none; d=google.com; s=arc-20160816; b=Zcl+8we0VxfZ4BIpCCms6lE8VsNAgKp1wrpQh+qzgLKl6oer7oNm2cSL9IIfFyBX83 4qdEcOpWiD7bldnQWAiQbmDcsOg3l1CE9X4sXhawVCsDbt9l2dYnjy/Qrq4nJZgl2GgB 1TtyRXrRFJPiwAFWBpZbjKVGmZTRtNti9orQdJo7Nk8CStnQ+ZvP+GmSbqWbL697kWZ2 zVhVXGtXPJgfbzR5gp5ZQ/OX8Z8CXsFNzqLkesDIu28sgCYpkGSe6jQZmZrFtjCVEELg ZpDex4tsdIc2sYouLCYCBnYeW2qItjXyrzFpL2wTDPHVFy7RYxM/MkyDenMuo2uWrohl TYfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:content-disposition:mime-version :message-id:subject:cc:to:from:date:dkim-signature; bh=cmReX5yn/6MzBKcNdErsm0OK10oGaUXumDT5snIQIGU=; b=puvD6XlmqacnVnCWcZ1RQ3p8TH9gs1FaZSvirYGAtoMnN72TdXe5zgJthveIRDXQ4c lIZclG0qyzh1tV60Qgrq5hbjg67fr9Tt5vtysUoQ64jvKlEkPCOLFPDIMltVHAqN3MaO RLqsY4vZ7hvT9euTcF53ocyGjPilZLsHaZOcGWe+/iSywdLHdgZBxn9Rj4rCLZ06YbZY XYKYB6M7rkc7kdD/OB1op2B6t6NZCKeLbZ9b6i3qx/pZHA2YUGYvgGXag4GRmpc39idH sPEDqyAzOtbI5W0+qKG6kPKXMObD6fRlUTupm2SU80m6uucjv9so62ppNVM/2orqh7HK dhnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Uz7C+VgF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n14-20020a05640205ce00b00425992205e5si12561364edx.346.2022.05.16.20.27.42; Mon, 16 May 2022 20:28:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Uz7C+VgF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347709AbiEPXE4 (ORCPT + 99 others); Mon, 16 May 2022 19:04:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347655AbiEPXEy (ORCPT ); Mon, 16 May 2022 19:04:54 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 065B345521 for ; Mon, 16 May 2022 16:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652742291; 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; bh=cmReX5yn/6MzBKcNdErsm0OK10oGaUXumDT5snIQIGU=; b=Uz7C+VgFvvWf3HEW0uV/vrGmYtkIDBCBdIX6aA49bdIoB4rTKDt6y9QBmZg0GGmlvKkxu5 goZOMVMRdr/+dX0hfRPpyCYQHiopgoYm1Rf0rC0W8tDStvWqij1s7iu3kFm+pT98pFuiF2 WdC5d6nD17nha0nC1JzztCOMKmtIKxM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-304-_Z5MfNZKM9qJnaaeI0HkrA-1; Mon, 16 May 2022 19:04:48 -0400 X-MC-Unique: _Z5MfNZKM9qJnaaeI0HkrA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E27B21D96CA0; Mon, 16 May 2022 23:04:47 +0000 (UTC) Received: from asgard.redhat.com (unknown [10.36.110.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E9BF40C1421; Mon, 16 May 2022 23:04:44 +0000 (UTC) Date: Tue, 17 May 2022 01:04:41 +0200 From: Eugene Syromiatnikov To: Jiri Olsa , Masami Hiramatsu , Steven Rostedt , Ingo Molnar , Alexei Starovoitov , Daniel Borkmann Cc: Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH bpf v2 0/4] Fix 32-bit arch and compat support for the kprobe_multi attach type Message-ID: <20220516230441.GA22091@asgard.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As suggested in [1], the kprobe_multi interface is to be fixed for 32-bit architectures and compat, rather then disabled. As it turned out, there are a couple of additional problems that are to be addressed: - the absence of size overflow checks, leading to possible out-of-bounds writes (addressed by the first patch); - the assumption that long has the same size as u64, which would make cookies arrays size calculation incorrect on 32-bit architectures (addressed by the second patch); - the addrs array passing API, that is incompatible with compat and has to be changed (addressed in the fourth patch): those are kernel addresses and not user ones (as was incorrectly stated in [2]); this change is only semantical for 64-bit user/kernelspace, so it shouldn't impact ABI there, at least. [1] https://lore.kernel.org/lkml/CAADnVQ+2gwhcMht4PuDnDOFKY68Wsq8QFz4Y69NBX_TLaSexQQ@mail.gmail.com/ [2] https://lore.kernel.org/lkml/20220510184155.GA8295@asgard.redhat.com/ v2: - Fixed the isses reported by CI v1: https://lore.kernel.org/lkml/20220516182657.GA28596@asgard.redhat.com/ Eugene Syromiatnikov (4): bpf_trace: check size for overflow in bpf_kprobe_multi_link_attach bpf_trace: support 32-bit kernels in bpf_kprobe_multi_link_attach bpf_trace: handle compat in kprobe_multi_resolve_syms bpf_trace: pass array of u64 values in kprobe_multi.addrs kernel/trace/bpf_trace.c | 62 ++++++++++++++++------ tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 8 +-- tools/lib/bpf/libbpf.h | 2 +- .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- .../selftests/bpf/prog_tests/kprobe_multi_test.c | 8 +-- 6 files changed, 56 insertions(+), 28 deletions(-) -- 2.1.4