Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d0a0658 authored by Ka-Cheong Poon's avatar Ka-Cheong Poon Committed by David S. Miller
Browse files

net/rds: Fix info leak in rds6_inc_info_copy() 



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: 3eb45036 ("rds: add type of service(tos) infrastructure")
Fixes: b7ff8b10 ("rds: Extend RDS API for IPv6 support")
Reported-by: default avatar黄ID蝴蝶 <butterflyhuangxx@gmail.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarKa-Cheong Poon <ka-cheong.poon@oracle.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c1644cf

net/rds/recv.c

+4 −1
Original line number Diff line number Diff line 
/*

 * 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_incoming *inc, 


	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_incoming *inc, 
		minfo6.fport = inc->i_hdr.h_dport;

	}



	minfo6.flags = 0;



	rds_info_copy(iter, &minfo6, sizeof(minfo6));

}

#endif