Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Two small (really, one liners both of them!) fixes that should go into
this series:
- Request allocation error handling fix for nbd, from Christophe,
fixing a regression in this series.
- An oops fix for drbd. Not a regression in this series, but stable
material. From Richard"
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: Fix kernel_sendmsg() usage - potential NULL deref
nbd: Fix error handling
+2
-2
+1
-1
drivers/block/drbd/drbd_main.c
+1
-1
drivers/block/drbd/drbd_main.c
···
1871
1871
drbd_update_congested(connection);
1872
1872
}
1873
1873
do {
1874
-
rv = kernel_sendmsg(sock, &msg, &iov, 1, size);
1874
+
rv = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len);
1875
1875
if (rv == -EAGAIN) {
1876
1876
if (we_should_drop_the_connection(connection, sock))
1877
1877
break;