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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 6AF4AC433EF for ; Sun, 8 Sep 2019 12:56:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3776D20644 for ; Sun, 8 Sep 2019 12:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947380; bh=UInMLA7CFEkckbHgViyrgOpN41KrT2K8pBfDhmGfCcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UBnzIixqGVNWzyJPkB/pMZNwlkM9eVi9eB3DkCP76reEVahBW0BNsdU9KpZKFpYMj ArqoRd8aR61+VuEXgKk3Q3/XRJmECAdVTPmG5Rj0EDSYAT8p/MXP0iMl9o3Ws35NLs VKAI06b/0QsdOxUzoBMTSlA+O7u8FvZGkIWOjKZU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731739AbfIHMtt (ORCPT ); Sun, 8 Sep 2019 08:49:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:40042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731719AbfIHMts (ORCPT ); Sun, 8 Sep 2019 08:49:48 -0400 Received: from localhost (unknown [62.28.240.114]) (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 940AF21A4A; Sun, 8 Sep 2019 12:49:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946988; bh=UInMLA7CFEkckbHgViyrgOpN41KrT2K8pBfDhmGfCcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R0g4qHtNAgT5GkUBs9Yi75SFqA3W56bfnYiLs4Uy8TWU9PbOd20hZxSBOOwut0pmQ z3Yn5n0zRkAlRj5APjnB2Dy1ns1U/NOa8sSdDmHoR32EZi8/DX2M+o6YrMgC/Phz/A RilOjW/Ep0fwEv02GQqmM0nkcKjW4qDVcmn90Bps= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?=E9=BB=84ID=E8=9D=B4=E8=9D=B6?= , Dan Carpenter , Ka-Cheong Poon , Santosh Shilimkar , "David S. Miller" Subject: [PATCH 5.2 19/94] net/rds: Fix info leak in rds6_inc_info_copy() Date: Sun, 8 Sep 2019 13:41:15 +0100 Message-Id: <20190908121150.989665197@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121150.420989666@linuxfoundation.org> References: <20190908121150.420989666@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: Ka-Cheong Poon [ Upstream commit 7d0a06586b2686ba80c4a2da5f91cb10ffbea736 ] The rds6_inc_info_copy() function has a couple struct members which are leaking stack information. The ->tos field should hold actual information and the ->flags field needs to be zeroed out. Fixes: 3eb450367d08 ("rds: add type of service(tos) infrastructure") Fixes: b7ff8b1036f0 ("rds: Extend RDS API for IPv6 support") Reported-by: 黄ID蝴蝶 Signed-off-by: Dan Carpenter Signed-off-by: Ka-Cheong Poon Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/rds/recv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/net/rds/recv.c +++ b/net/rds/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -811,6 +811,7 @@ void rds6_inc_info_copy(struct rds_incom minfo6.seq = be64_to_cpu(inc->i_hdr.h_sequence); minfo6.len = be32_to_cpu(inc->i_hdr.h_len); + minfo6.tos = inc->i_conn->c_tos; if (flip) { minfo6.laddr = *daddr; @@ -824,6 +825,8 @@ void rds6_inc_info_copy(struct rds_incom minfo6.fport = inc->i_hdr.h_dport; } + minfo6.flags = 0; + rds_info_copy(iter, &minfo6, sizeof(minfo6)); } #endif