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=-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,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 3086DC388F9 for ; Tue, 27 Oct 2020 15:02:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD71F222C8 for ; Tue, 27 Oct 2020 15:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810925; bh=1O3HA3EBzE4msZhuBrHkLy8BBzalcw41zC2njxyqYX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AK9qCq/v/J3i5ih3zaAXOGENVJJVOzKAovH2eImJ9ks3Oyo2+SJjIIPDClitq/sgU D++B75w26sys2UOxug96wHQiwGoUftZiBKjOwB3BU3gCqIDm26gxfUakhWcG3XMNdC LV3o6R4Ufi3s0dwiKO+aLlWxfXBKwY+l06k9XZd0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1789374AbgJ0PCD (ORCPT ); Tue, 27 Oct 2020 11:02:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:60248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1773109AbgJ0O6p (ORCPT ); Tue, 27 Oct 2020 10:58:45 -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 A79BE22264; Tue, 27 Oct 2020 14:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810725; bh=1O3HA3EBzE4msZhuBrHkLy8BBzalcw41zC2njxyqYX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msURf4irBuI7TlX8z45n4G0Z97jjgvHYu2LlhZSnWUnV/LsjQ4q3BYEbQrE1aHSdg F4abSeyfKLZb8gmk6JP/R0MMLG9FYmJ6k5P0ThLYVBmgiRgKv5j6vVHt4o4W4piQT0 n9nBX2CyhzFfWJ4uVHbGGrKy0pVw5bWWqJ0B6jAs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Leoshkevich , Daniel Borkmann , Andrii Nakryiko , Sasha Levin Subject: [PATCH 5.8 240/633] selftests/bpf: Fix endianness issue in test_sockopt_sk Date: Tue, 27 Oct 2020 14:49:43 +0100 Message-Id: <20201027135533.930959765@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilya Leoshkevich [ Upstream commit fec47bbc10b243690f5d0ee484a0bbdee273e71b ] getsetsockopt() calls getsockopt() with optlen == 1, but then checks the resulting int. It is ok on little endian, but not on big endian. Fix by checking char instead. Fixes: 8a027dc0d8f5 ("selftests/bpf: add sockopt test that exercises sk helpers") Signed-off-by: Ilya Leoshkevich Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20200915113928.3768496-1-iii@linux.ibm.com Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_sk.c b/tools/testing/selftests/bpf/prog_tests/sockopt_sk.c index 5f54c6aec7f07..b25c9c45c1484 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_sk.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_sk.c @@ -45,9 +45,9 @@ static int getsetsockopt(void) goto err; } - if (*(int *)big_buf != 0x08) { + if (*big_buf != 0x08) { log_err("Unexpected getsockopt(IP_TOS) optval 0x%x != 0x08", - *(int *)big_buf); + (int)*big_buf); goto err; } -- 2.25.1