diff options
| author | Peilin Ye <yepeilin.cs@gmail.com> | 2020-07-30 15:20:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-21 11:01:49 +0200 |
| commit | 2b9c45b6dc95dc2920c2d0abec219dcb22f49bb0 (patch) | |
| tree | eca6982937b60832c0f641faf0be539b9c67067d /net/rds | |
| parent | 1231b93ef951229930f27f6e86ec3673e853178a (diff) | |
| download | linux-stable-2b9c45b6dc95dc2920c2d0abec219dcb22f49bb0.tar.gz linux-stable-2b9c45b6dc95dc2920c2d0abec219dcb22f49bb0.tar.bz2 linux-stable-2b9c45b6dc95dc2920c2d0abec219dcb22f49bb0.zip | |
rds: Prevent kernel-infoleak in rds_notify_queue_get()
commit bbc8a99e952226c585ac17477a85ef1194501762 upstream.
rds_notify_queue_get() is potentially copying uninitialized kernel stack
memory to userspace since the compiler may leave a 4-byte hole at the end
of `cmsg`.
In 2016 we tried to fix this issue by doing `= { 0 };` on `cmsg`, which
unfortunately does not always initialize that 4-byte hole. Fix it by using
memset() instead.
Cc: stable@vger.kernel.org
Fixes: f037590fff30 ("rds: fix a leak of kernel memory")
Fixes: bdbe6fbc6a2f ("RDS: recv.c")
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/recv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rds/recv.c b/net/rds/recv.c index f16ee1b13b8d..488a198be3e1 100644 --- a/net/rds/recv.c +++ b/net/rds/recv.c @@ -405,12 +405,13 @@ static int rds_still_queued(struct rds_sock *rs, struct rds_incoming *inc, int rds_notify_queue_get(struct rds_sock *rs, struct msghdr *msghdr) { struct rds_notifier *notifier; - struct rds_rdma_notify cmsg = { 0 }; /* fill holes with zero */ + struct rds_rdma_notify cmsg; unsigned int count = 0, max_messages = ~0U; unsigned long flags; LIST_HEAD(copy); int err = 0; + memset(&cmsg, 0, sizeof(cmsg)); /* fill holes with zero */ /* put_cmsg copies to user space and thus may sleep. We can't do this * with rs_lock held, so first grab as many notifications as we can stuff |