[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1478601789-15060-1-git-send-email-richard@nod.at>
Date: Tue, 8 Nov 2016 11:43:09 +0100
From: Richard Weinberger <richard@....at>
To: drbd-dev@...ts.linbit.com
Cc: linux-kernel@...r.kernel.org, lars.ellenberg@...bit.com,
philipp.reisner@...bit.com, Richard Weinberger <richard@....at>,
stable@...r.kernel.org, viro@...iv.linux.org.uk,
christoph.lechleitner@...g.at, wolfgang.glas@...g.at
Subject: [PATCH] drbd: Fix kernel_sendmsg() usage
Don't pass a size larger than iov_len to kernel_sendmsg().
Otherwise it will cause a NULL pointer deref when kernel_sendmsg()
returns with rv < size.
Although the issue exists since day 0, only on non-ancient kernels
that contain change 57be5bdad759 ("ip: convert tcp_sendmsg() to iov_iter
primitives") it seems to trigger [0][1][2][3][4].
[0] http://lists.linbit.com/pipermail/drbd-user/2016-July/023112.html
[1] http://lists.linbit.com/pipermail/drbd-dev/2016-March/003362.html
[2] https://forums.grsecurity.net/viewtopic.php?f=3&t=4546
[3] https://ubuntuforums.org/showthread.php?t=2336150
[4] http://e2.howsolveproblem.com/i/1175162/
Fixes: b411b3637fa71fc ("The DRBD driver")
Cc: stable@...r.kernel.org
Cc: viro@...iv.linux.org.uk
Cc: christoph.lechleitner@...g.at
Cc: wolfgang.glas@...g.at
Reported-by: Christoph Lechleitner <christoph.lechleitner@...g.at>
Tested-by: Christoph Lechleitner <christoph.lechleitner@...g.at>
Signed-off-by: Richard Weinberger <richard@....at>
---
drivers/block/drbd/drbd_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 100be556e613..cbec781c2b57 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1871,7 +1871,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,
drbd_update_congested(connection);
}
do {
- rv = kernel_sendmsg(sock, &msg, &iov, 1, size);
+ rv = kernel_sendmsg(sock, &msg, &iov, 1, size - sent);
if (rv == -EAGAIN) {
if (we_should_drop_the_connection(connection, sock))
break;
--
2.7.3
Powered by blists - more mailing lists