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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, 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 5B659C43387 for ; Thu, 20 Dec 2018 09:32:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C57F20449 for ; Thu, 20 Dec 2018 09:32:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298351; bh=wQI2Y6PNJ3ykJGEs4RTTAw6BCEQ3IiXA5SYgHAjOUYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UF12ewTt7luTVbSOEzDQkLbSeGCf2yuWVN6EAKYj2MZadLytG+v2GpIExsgaqELb9 hWlRTTQQ2uL2ReTJirX2Vb3qFXnhybkU/oGHvfGnogHgZXR/QzS+9GGcb+cDPDPplD GNLekmb0DsAW5MHvTwzrGvf74Jsn1aXulETbLIzc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732678AbeLTJbO (ORCPT ); Thu, 20 Dec 2018 04:31:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:44928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731479AbeLTJbK (ORCPT ); Thu, 20 Dec 2018 04:31:10 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 2011C21741; Thu, 20 Dec 2018 09:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298269; bh=wQI2Y6PNJ3ykJGEs4RTTAw6BCEQ3IiXA5SYgHAjOUYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oz20By4ETC6bb7KgeE6Ifw2sOUxJffyvHDG9bqERwszVZYv0HBRqaIZaw7aNFfuKF eU+7L9+eeqDrnTo3MEjesPToLuRWERU9hY6McONymlE+cqTLLXmYyXwm9CoxqO+VcF J1DzSJ76ZiLFm1Q9WwKLQ5Ez0gm6gtODAX4vmiws= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "David S. Miller" , Alexei Starovoitov , Sasha Levin Subject: [PATCH 4.19 25/67] bpf: Fix verifier log string check for bad alignment. Date: Thu, 20 Dec 2018 10:18:37 +0100 Message-Id: <20181220085904.544177870@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085903.562090333@linuxfoundation.org> References: <20181220085903.562090333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c01ac66b38660f2b507ccd0b75d28e3002d56fbb ] The message got changed a lot time ago. This was responsible for 36 test case failures on sparc64. Fixes: f1174f77b50c ("bpf/verifier: rework value tracking") Signed-off-by: David S. Miller Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/test_verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 2bde9ee04db7..e436b67f2426 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -12765,7 +12765,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, reject_from_alignment = fd_prog < 0 && (test->flags & F_NEEDS_EFFICIENT_UNALIGNED_ACCESS) && - strstr(bpf_vlog, "Unknown alignment."); + strstr(bpf_vlog, "misaligned"); #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS if (reject_from_alignment) { printf("FAIL\nFailed due to alignment despite having efficient unaligned access: '%s'!\n", -- 2.19.1