net/smc: Prevent kernel-infoleak in __smc_diag_dump()
PATCH 1/1 net/smc: Prevent kernel-infoleak in __smc_diag_dump()
From: Peilin Ye <[email protected]>
__smc_diag_dump() is potentially copying uninitialized kernel stack memory into socket buffers, since the compiler may leave a 4-byte hole near the beginning of struct smcd_diag_dmbinfo. Fix it by initializing dinfo with memset().
--- net/smc/smc_diag.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/smc/smc_diag.c +9 -7
@@ -170,13 +170,15 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb, (req->diag_ext & (1 << (SMC_DIAG_DMBINFO - 1))) && !list_empty(&smc->conn.lgr->list)) {struct smc_connection *conn = &smc->conn; -struct smcd_diag_dmbinfo dinfo = { - .linkid = *((u32 *)conn->lgr->id), - .peer_gid = conn->lgr->peer_gid, - .my_gid = conn->lgr->smcd->local_gid, - .token = conn->rmb_desc->token, - .peer_token = conn->peer_token - }; +struct smcd_diag_dmbinfo dinfo; + +memset (&dinfo,0 ,sizeof (dinfo)); + + dinfo.linkid = *((u32 *)conn->lgr->id); + dinfo.peer_gid = conn->lgr->peer_gid; + dinfo.my_gid = conn->lgr->smcd->local_gid; + dinfo.token = conn->rmb_desc->token; + dinfo.peer_token = conn->peer_token;if (nla_put (skb,SMC_DIAG_DMBINFO ,sizeof (dinfo), &dinfo) <0 ) goto errout;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Ursula Braun <[email protected]>
Date: Thu, 20 Aug 2020 16:30:52 +0200
Quoted 8 lines
From: Peilin Ye <[email protected]>
__smc_diag_dump()is potentially copying uninitialized kernel stack memory into socket buffers, since the compiler may leave a 4-byte hole near the beginning ofstruct smcd_diag_dmbinfo. Fix it by initializingdinfowithmemset().
Please do not CC: stable for networking patches as per the netdev FAQ.
Quoted 4 lines
Fixes 4b1b7d3b30a6 ("net/smc: add SMC-D diag support")Suggested-by Dan Carpenter <[email protected]>Signed-off-by Peilin Ye <[email protected]>Signed-off-by Ursula Braun <[email protected]>
Applied and queued up for -stable, thank you.