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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8614BC7EE29 for ; Mon, 22 May 2023 20:35:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2369A900004; Mon, 22 May 2023 16:35:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C005900002; Mon, 22 May 2023 16:35:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F16BE900004; Mon, 22 May 2023 16:35:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DB3A2900002 for ; Mon, 22 May 2023 16:35:56 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B1009C04A5 for ; Mon, 22 May 2023 20:35:56 +0000 (UTC) X-FDA: 80819047512.22.2195556 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 072BE180002 for ; Mon, 22 May 2023 20:35:53 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RvIIl7Jw; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf06.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684787754; a=rsa-sha256; cv=none; b=FXUlKqXuuwQRquUSUgUgHOMqOrD9+8uJ9Lom3urlV/gR4MtySbNCs+c9spiML27Wu+jSRB 8UeOcQlyLLBzkTia1S9cJ2sD12bCKBYhIpoouACPlQcaT/N2Uaja48qRF6j4YR/I/yY1UF UukxiYGujJ3ZyP+j0+Cgaqqlsf3o6pQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RvIIl7Jw; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf06.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684787754; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=V9sqN52AFdCDJbEYI+OOp4eJ+ldK2Sa5VtE0bull/EE=; b=Ak0P0yh4DeKV3YcoCkUTauQxPqUpzPAd6Evzs8SamCTf9z+jQz3CVclNaWU9ZY7ZeXYSfe HOn0zz1gtqSTB99KlxmU+wqXKwzv2zX307Xhppn0E20eyAKpCD4mo43OA6L9PD2cdUdYPO djlz318h0OsiRd/T/6PZiFAxM1mece8= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2D27D62BC8; Mon, 22 May 2023 20:35:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AD92C433D2; Mon, 22 May 2023 20:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684787752; bh=0nQ8xIPSPhBIr1gc3+npYhNke4IXHy+5EM39FqGHhHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RvIIl7JwcJq1f1lT50bQTaPuLv0NZy78hJqb4UTvWapPNbd41FW80wvaW4pH0aAOo 4TFqg8491i9Zl3rQRFtYXMLVrUEjAIN2Sus2yH0U8HOELjOAhTmZZlj6/RVSV3KFvt Xe9iqVfgcL67vJ4LphGTNfl2Ao1Ub0EQ7bS13b2S6nILe6dKwQjN4s3A5ifjdgD6B8 HKSBErLqGZ2KGI5RO4zGnfoSCGGwg236gdTcm9UFy3mIkKjxjyKFjwyOA5VTnN1Ir6 STLK7od7jNeP4m7FYg/VWUGu+uTiQw4V/Ub1n/8uiGlC7+KimKstqJvqYoDpmxE5EM cl8yPMWAoz3Ag== From: Jiri Olsa To: stable@vger.kernel.org Cc: Christoph Hellwig , John Fastabend , linux-mm@kvack.org, bpf@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Masami Hiramatsu , Tsahee Zidenberg , Andrii Nakryiko , Daniel Borkmann , Thomas Gleixner , =?UTF-8?q?Mah=C3=A9=20Tardy?= , linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH stable 5.4 8/8] bpf: bpf_probe_read_kernel_str() has to return amount of data read on success Date: Mon, 22 May 2023 22:33:52 +0200 Message-Id: <20230522203352.738576-9-jolsa@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522203352.738576-1-jolsa@kernel.org> References: <20230522203352.738576-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 072BE180002 X-Stat-Signature: cj8b1i4co86rzanqtg678kkmj94o3gr1 X-HE-Tag: 1684787753-97192 X-HE-Meta: U2FsdGVkX19QIGP/ZZbX4fONi+HXvf11UkNKjvAlMeX9FAiEpajt8Tv6U8RRi/+MUkGiUiIEgUZhySQcOni/oMDSNLE0V/YvT1eqcHW7HQvrPD2XkP+izPcB7l3eEsOVTuqaB+K/gDecLxN0MwAuI89RQH2658u6CEXIqrQC9pYyITnhINd6OvrjXSzS/ZrUMgCT9vMjRt77St1W8cjXZefap5lg74iOWxVnIHJH8FJ8R7Ui7J8I1eSMclmyyv8oWkycNBuf2on474RDPx13SDr1EeaUpnn77uFYvzGCcHql9gHbZhspxZbRxgW0yfBByJhR6WkW4937Tbc3XG+7KVLeIyvuwWm4vrW5c6d3DLo/HR+aTzyUkO/zW8FafbRC90LRzN7Ix2xFyFpIWgPTnjHcs3xfRsdOVzkRkguC5qdvWS9T89DGTgBq6R7E5r9+z1IKTgnLjW6IQrElgpm9PK1oa6aFSqjprd78K7dqL67H61fdlWhIkjHF7udfy0GTmlsCJeAk25QeEX5I6jT1mGmWPJNyMP9Z7di/eaXFEqaytJBjBO5iicl7trMtl3V0UlKODIb2lxSs/RnY3m3Pe5CpOdRo+L1YL7gtDXc1XEpMCSYKphPc4dxFoqmWRL8NvoFroG1s8Uv/tkhynCBEkLrWwIePrtJy7/f1PLm1DnGUwNMYgOjkhvNEiijKmL73KpVsDGQFXP06VJKeMk4yu857bPwOLeEsDjsJE6xpQ4H9LNG6ShnwfWaHWDxqwXl+g0iSjdSeCyxWUr2RPDDG1pxMhZzPplw/UjIM0NGKO/br0Esl/INrC9cRA6+PSOgEtfyC5M4nzIF2adXCFT20qyWkkZnzMdFSc+unTcTptXreClLEsOjavoEkxr1HCIla/qXjdO4488p88rMKnw5RfTCNXwnfIKAQflnvnfBmIoXcKEcAizxuUce+EyK4y7Ycixao+G3nBK8dQJh8phv XSyUdU9Q +k7YMGXymYMD4zVJMgLSW0a74G9/m/ws+D5r7+LxQ6DII6v2JmzlAMM3OBN0jFX19dM/pZ4CO0efwkf158YMrGl/DKvW/X1k8xpDMeVwbQXoOUhKljAy/3rWpTl6uqfjy0ZEHL+n5LlXSwQHyLskFBRkz8zZ52MPSSXMHv4evBz/rX8/9ErAGKuvkeKLDujupRFPWm7yMrogo9V57nGK6t56JZPhchp5dxeToCJyj8TdGJ46sFI5P2X0xWy/AFATkmf5kQNRVPEAjbfcvWrYXVmd0Z4jJfW7gL0i2n4UR+sKaM5XBBI6MsJOW/IvqjOSnwzSPXnOiLut8tw/H0E8XG6Kwi18/cwQX0o4n7HjY74uhqYPRE/3tQbJxe8j6MbEAaGU3HqQ+MEVVs2NUqAbBknpzLdUle6feXaIU/ySOdE2GM3GzQuRPh3qIatFKDAC98qdHcwYL/tHh/C5pHnoQkfNPAmNaWUbtOYYL4u0bvUqd3w/UTH/6fvsoencezLNCTky1YeJApdmhPbrHvgVMPgXqbyR9FZR49xHV0VpfnWrVyatHauT61P8hIJHnEqPiGH5wqE74chJXQCA2iSg3UA6MERxqpTuiLfAm8qBLuTZ2zXK42cBIvR1Zr6SGU0sIglL+OGNucf8Ms4TjGh8LRC5WXMGJVuhYF0HX X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Andrii Nakryiko commit 02553b91da5deb63c8562b47529b09b734659af0 upstream. During recent refactorings, bpf_probe_read_kernel_str() started returning 0 on success, instead of amount of data successfully read. This majorly breaks applications relying on bpf_probe_read_kernel_str() and bpf_probe_read_str() and their results. Fix this by returning actual number of bytes read. Fixes: 8d92db5c04d1 ("bpf: rework the compat kernel probe handling") Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Reviewed-by: Christoph Hellwig Acked-by: John Fastabend Link: https://lore.kernel.org/bpf/20200616050432.1902042-1-andriin@fb.com --- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index a46256f99229..c4c825dcdef8 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -198,7 +198,7 @@ bpf_probe_read_kernel_str_common(void *dst, u32 size, const void *unsafe_ptr) if (unlikely(ret < 0)) goto fail; - return 0; + return ret; fail: memset(dst, 0, size); return ret; -- 2.40.1