From patchwork Tue Oct 27 13:47:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 289610 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 1F30FC8301E for ; Tue, 27 Oct 2020 15:47:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE028207C3 for ; Tue, 27 Oct 2020 15:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813653; bh=/3iBYdK1MPa6Th6bGLCVOq1Dr6W1XCeD4wUwu+g2eh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I+zCA7nQzASioIQvf6XtpYpWjT1ZJZHgnA9Qt7Xshma44K+Xfush73FEEh6nVRDai xjMJJvC5qdTXOTZAFwPD43hEYTOgSkbJJIYJhu1PTHmbVmxkS3gGHZGWZg2odqMLN6 Mc4ORLlIAPkEmOQC0HxoGtQ4STL+OqMLv2JE3PwI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1802204AbgJ0PqA (ORCPT ); Tue, 27 Oct 2020 11:46:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:44518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1798526AbgJ0P2f (ORCPT ); Tue, 27 Oct 2020 11:28:35 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A7072225E; Tue, 27 Oct 2020 15:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812514; bh=/3iBYdK1MPa6Th6bGLCVOq1Dr6W1XCeD4wUwu+g2eh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MFR/AW53DONmC9XCdyDAbzWKXJwIzOkfxfZT64hDv+3DyAVVzPO6HXtSWXSxkY2cW AYZroci1H/Gtmhj3coaGac5Izr4iHVTPhCNkw9nNeDpz1H96tQ+6c++6R+ybBrJlV5 VkHT7XGzKzsck02wj9pby5XdRLBSvKkUchhOBKn0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Gartrell , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.9 209/757] libbpf: Fix unintentional success return code in bpf_object__load Date: Tue, 27 Oct 2020 14:47:39 +0100 Message-Id: <20201027135500.419798904@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Gartrell [ Upstream commit ef05afa66c59c2031a3798916ef3ff3778232129 ] There are code paths where EINVAL is returned directly without setting errno. In that case, errno could be 0, which would mask the failure. For example, if a careless programmer set log_level to 10000 out of laziness, they would have to spend a long time trying to figure out why. Fixes: 4f33ddb4e3e2 ("libbpf: Propagate EPERM to caller on program load") Signed-off-by: Alex Gartrell Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200826075549.1858580-1-alexgartrell@gmail.com Signed-off-by: Sasha Levin --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e493d6048143f..8b71a31ca4a97 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -5425,7 +5425,7 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt, free(log_buf); goto retry_load; } - ret = -errno; + ret = errno ? -errno : -LIBBPF_ERRNO__LOAD; cp = libbpf_strerror_r(errno, errmsg, sizeof(errmsg)); pr_warn("load bpf program failed: %s\n", cp); pr_perm_msg(ret);