Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp364814pxx; Wed, 28 Oct 2020 06:48:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9y4ATAM8TA2mpc6kl1C9rqlu+udkdx9hZ27jfOjgeC4yhnQ0FmvrrExm+OREcEUvx0B4p X-Received: by 2002:a05:6402:1615:: with SMTP id f21mr8151529edv.257.1603892892809; Wed, 28 Oct 2020 06:48:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603892892; cv=none; d=google.com; s=arc-20160816; b=GrGfu8BPWU9GWkzinIdfbpngAUZ0kzpQX33EbXYB+6DhC5+4hVwyHXZx9WJBhZWjIh foInNdKTlf6y3GMZi2EHvoLSNkMs9xV4q4dV+b2aWWGzo7FV0tXZB7XBMQOf1E9I2n1M bMqt7v1bDttzgvEqZ7XWZ73Ay76sz5lwuUdItd4ezzNMiDcU2FpI+035Y764P3x2+Cyi ibspokgn/I1qVgO1FNhHwZTevBtL+4xo+/9SRlV+Hx6tCx3SYMJUEe/A02zfj68iluaz Oi4NQtkYcs2xZyDadOGac/gTrpkZnwohdtqyr7D7gP+R4XNJdRTQc854QVhSFwbYKOwt 6Ahw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lqwFgBYZJDZQsQwz8zv+NlrJc8YQsPT+t9SxsD2A08A=; b=wXs5RD+72Lo4LnIE9ikZy4kDA2n5qhs+TToArm3tQdr+84Pwpfz9skdYQJvxIUsoDg ZCzd/24bIfyAx97wrjIclnvXaQQxlh9qHDjbKkeCofNfIe9tM0zzzHkqvPxTpl8ok4a4 YxOmIbo0nMAZUdtdnA1SpOaoKGoX1mJvyGUVDQn1p/Xw6fSc0msLSgK++GwBpFThVFTn vKZnZtcB1OlvPFSj3nhFt+8ea1yq73AhzlBKM2XUf7rY9fKhrTbCI3xslxLEs5lHuoRq 1GgwF8Rnj0wY/LSN6ZBfmK0PI2lK1hAhGGFgaO5yI569HQ8/Dp9IY9heh5+jjwJfSh/c w+Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="L/L+PfFq"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q18si2524555edb.466.2020.10.28.06.47.50; Wed, 28 Oct 2020 06:48:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="L/L+PfFq"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1803161AbgJ0PwV (ORCPT + 99 others); Tue, 27 Oct 2020 11:52:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:47710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1799314AbgJ0Pav (ORCPT ); Tue, 27 Oct 2020 11:30:51 -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 C8C282225E; Tue, 27 Oct 2020 15:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812651; bh=1O3HA3EBzE4msZhuBrHkLy8BBzalcw41zC2njxyqYX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L/L+PfFqEIZMGI7Ba9U2Cme+KCJVtVm6gGdHu/keImsw5Bv2fjSc04mFP9iu2ElNg KFKP/Wj6eNmotsf00NqO1Avpjn2J7Y6p7Jz9oDM9jKEG2qXL976g8HRZg5DspXVYmN ZWJh33qbdq4YRi+tdvCFP2oUjkEcl3royzkOzl48= 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.9 284/757] selftests/bpf: Fix endianness issue in test_sockopt_sk Date: Tue, 27 Oct 2020 14:48:54 +0100 Message-Id: <20201027135503.897598737@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 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