Commit 7b07f8eb authored Aug 15, 2012 by Mathias Krause Committed by David S. Miller Aug 15, 2012

dccp: fix info leak via getsockopt(DCCP_SOCKOPT_CCID_TX_INFO)



The CCID3 code fails to initialize the trailing padding bytes of struct
tfrc_tx_info added for alignment on 64 bit architectures. It that for
potentially leaks four bytes kernel stack via the getsockopt() syscall.
Add an explicit memset(0) before filling the structure to avoid the
info leak.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 276bdb82

net/dccp/ccids/ccid3.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
		case DCCP_SOCKOPT_CCID_TX_INFO:
		if (len < sizeof(tfrc))
		return -EINVAL;
		memset(&tfrc, 0, sizeof(tfrc));
		tfrc.tfrctx_x = hc->tx_x;
		tfrc.tfrctx_x_recv = hc->tx_x_recv;
		tfrc.tfrctx_x_calc = hc->tx_x_calc;

Admin message