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.8 required=3.0 tests=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=unavailable 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 C0B28C2D0D1 for ; Sun, 29 Dec 2019 18:09:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93240207FF for ; Sun, 29 Dec 2019 18:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642955; bh=1xcMMT3Xv6K8NqYsrKf0WvTs26fBGJW1QID2H940DkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uUZRn2b3zBoB+fXoKR+gHRt9C+KS/hZ+iId94Ojl9HH3Zf/0o69tK6NpLei+WXyhJ zZSIZqXZXjK0ih/ETatxv+s50EqB5gmQzbuHsTCAKJtKbviBn0Xv94ycjlYQwlYyLB fa2cxf3uWmcFx3DH6WsnNp/rAlemDbSWmPqRZykk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731010AbfL2RqF (ORCPT ); Sun, 29 Dec 2019 12:46:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:55534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731006AbfL2RqF (ORCPT ); Sun, 29 Dec 2019 12:46:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 0B885207FF; Sun, 29 Dec 2019 17:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641564; bh=1xcMMT3Xv6K8NqYsrKf0WvTs26fBGJW1QID2H940DkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SP+xUQxKLJuMAnPACK9o6ZVXckzoSXlQ5yBjK0yL18/DDxC3RQd0WIdjw6MUSe/Qo IRQI1vk15H7mhSWGO1SXVswGusbTeCj5cEeYxuxgkTem0bnobaVhoXj7g4n5lG9Yba MtigMidCcG+iAUw+jf8dyPTt/zKZgIgK99VViyhQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Maximets , Alexei Starovoitov , Andrii Nakryiko , Sasha Levin Subject: [PATCH 5.4 119/434] libbpf: Fix passing uninitialized bytes to setsockopt Date: Sun, 29 Dec 2019 18:22:52 +0100 Message-Id: <20191229172709.591629300@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ilya Maximets [ Upstream commit 25bfef430e960e695403b5d9c8dcc11b9f5d62be ] 'struct xdp_umem_reg' has 4 bytes of padding at the end that makes valgrind complain about passing uninitialized stack memory to the syscall: Syscall param socketcall.setsockopt() points to uninitialised byte(s) at 0x4E7AB7E: setsockopt (in /usr/lib64/libc-2.29.so) by 0x4BDE035: xsk_umem__create@@LIBBPF_0.0.4 (xsk.c:172) Uninitialised value was created by a stack allocation at 0x4BDDEBA: xsk_umem__create@@LIBBPF_0.0.4 (xsk.c:140) Padding bytes appeared after introducing of a new 'flags' field. memset() is required to clear them. Fixes: 10d30e301732 ("libbpf: add flags to umem config") Signed-off-by: Ilya Maximets Signed-off-by: Alexei Starovoitov Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20191009164929.17242-1-i.maximets@ovn.org Signed-off-by: Sasha Levin --- tools/lib/bpf/xsk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index a902838f9fcc..9d5348086203 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -163,6 +163,7 @@ int xsk_umem__create_v0_0_4(struct xsk_umem **umem_ptr, void *umem_area, umem->umem_area = umem_area; xsk_set_umem_config(&umem->config, usr_config); + memset(&mr, 0, sizeof(mr)); mr.addr = (uintptr_t)umem_area; mr.len = size; mr.chunk_size = umem->config.frame_size; -- 2.20.1