Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/smc: Prevent kernel-infoleak in __smc_diag_dump()

__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().

Fixes: 4b1b7d3b30a6 ("net/smc: add SMC-D diag support")
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Peilin Ye and committed by
David S. Miller
ce51f63e 3e659a82

+9 -7
+9 -7
net/smc/smc_diag.c
··· 170 170 (req->diag_ext & (1 << (SMC_DIAG_DMBINFO - 1))) && 171 171 !list_empty(&smc->conn.lgr->list)) { 172 172 struct smc_connection *conn = &smc->conn; 173 - struct smcd_diag_dmbinfo dinfo = { 174 - .linkid = *((u32 *)conn->lgr->id), 175 - .peer_gid = conn->lgr->peer_gid, 176 - .my_gid = conn->lgr->smcd->local_gid, 177 - .token = conn->rmb_desc->token, 178 - .peer_token = conn->peer_token 179 - }; 173 + struct smcd_diag_dmbinfo dinfo; 174 + 175 + memset(&dinfo, 0, sizeof(dinfo)); 176 + 177 + dinfo.linkid = *((u32 *)conn->lgr->id); 178 + dinfo.peer_gid = conn->lgr->peer_gid; 179 + dinfo.my_gid = conn->lgr->smcd->local_gid; 180 + dinfo.token = conn->rmb_desc->token; 181 + dinfo.peer_token = conn->peer_token; 180 182 181 183 if (nla_put(skb, SMC_DIAG_DMBINFO, sizeof(dinfo), &dinfo) < 0) 182 184 goto errout;