* [PATCH net 1/1] net/smc: Prevent kernel-infoleak in __smc_diag_dump()
@ 2020-08-20 14:30 Ursula Braun
2020-08-20 19:09 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ursula Braun @ 2020-08-20 14:30 UTC (permalink / raw)
To: davem
Cc: netdev, linux-s390, heiko.carstens, kgraul, raspl, yepeilin.cs, ubraun
From: Peilin Ye <yepeilin.cs@gmail.com>
__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().
Cc: stable@vger.kernel.org
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>
---
net/smc/smc_diag.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c
index e1f64f4ba236..da9ba6d1679b 100644
--- a/net/smc/smc_diag.c
+++ b/net/smc/smc_diag.c
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net 1/1] net/smc: Prevent kernel-infoleak in __smc_diag_dump()
2020-08-20 14:30 [PATCH net 1/1] net/smc: Prevent kernel-infoleak in __smc_diag_dump() Ursula Braun
@ 2020-08-20 19:09 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-08-20 19:09 UTC (permalink / raw)
To: ubraun; +Cc: netdev, linux-s390, heiko.carstens, kgraul, raspl, yepeilin.cs
From: Ursula Braun <ubraun@linux.ibm.com>
Date: Thu, 20 Aug 2020 16:30:52 +0200
> From: Peilin Ye <yepeilin.cs@gmail.com>
>
> __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().
>
> Cc: stable@vger.kernel.org
Please do not CC: stable for networking patches as per the netdev FAQ.
> 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>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-20 19:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-20 14:30 [PATCH net 1/1] net/smc: Prevent kernel-infoleak in __smc_diag_dump() Ursula Braun
2020-08-20 19:09 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.