Skip to content

Commit

Permalink
net/rds: Fix info leak in rds6_inc_info_copy()
Browse files Browse the repository at this point in the history
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: 3eb4503 ("rds: add type of service(tos) infrastructure")
Fixes: b7ff8b1 ("rds: Extend RDS API for IPv6 support")
Reported-by: 黄ID蝴蝶 <butterflyhuangxx@gmail.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ka-Cheong Poon <ka-cheong.poon@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ka-Cheong Poon authored and David S. Miller committed Aug 28, 2019
1 parent 2c1644c commit 7d0a065
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/rds/recv.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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

0 comments on commit 7d0a065

Please sign in to comment.