Attachment 308279 Details for Bug 449812 – patch to disallow sending requests after a send has failed.

[patch] patch to disallow sending requests after a send has failed.

shutdown_after_failure.patch (text/plain), 1.68 KB, created by Ben Marzinski on 2008-06-03 18:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Marzinski

Created: 2008-06-03 18:50:20 UTC

Size: 1.68 KB

patch

obsolete

>Index: gnbd-kernel-0.1.4/src/gnbd.c
>===================================================================
>--- gnbd-kernel-0.1.4.orig/src/gnbd.c
>+++ gnbd-kernel-0.1.4/src/gnbd.c
>@@ -401,6 +401,12 @@ int __gnbd_send_req(struct gnbd_device *
> 
> 	down(&dev->tx_lock);
> 
>+	if (dev->corrupt) {
>+		printk(KERN_ERR "%s: Attempted to send on a faulty socket\n",
>+		       dev->disk->disk_name);
>+		result = -EBADFD;
>+		goto error_out;
>+	}
> 	if (!sock) {
> 		printk(KERN_ERR "%s: Attempted send on closed socket\n",
> 				dev->disk->disk_name);
>@@ -455,6 +461,7 @@ int __gnbd_send_req(struct gnbd_device *
> 	return 0;
> 
> send_error_out:
>+	dev->corrupt = 1;
> 	dev->current_request = NULL;
> 	wake_up(&dev->tx_wait);
> error_out:
>@@ -519,6 +526,11 @@ int gnbd_do_it(struct gnbd_device *dev)
> 	BUG_ON(dev->magic != GNBD_MAGIC);
> 
> 	while((result = sock_xmit(sock, 0, &reply,sizeof(reply), MSG_WAITALL, 1)) > 0){
>+		if (dev->corrupt) {
>+			printk(KERN_ERR "%s: faulty socket\n",dev->disk->disk_name);
>+			return -EBADFD;
>+		}
>+
> 		if (ntohl(reply.magic) == GNBD_KEEP_ALIVE_MAGIC)
> 			/* FIXME -- I should reset the wait time here */
> 			continue;
>@@ -788,6 +800,7 @@ static int gnbd_ctl_ioctl(struct inode *
> 		}
> 		dev->file = file;
> 		dev->sock = SOCKET_I(inode);
>+		dev->corrupt = 0;
> 		dev->receiver_pid = current->pid; 
> 		blk_run_queue(dev->disk->queue);
> 		error = gnbd_do_it(dev);
>Index: gnbd-kernel-0.1.4/src/gnbd.h
>===================================================================
>--- gnbd-kernel-0.1.4.orig/src/gnbd.h
>+++ gnbd-kernel-0.1.4/src/gnbd.h
>@@ -58,6 +58,7 @@ struct gnbd_device {
> 	struct block_device *bdev;
> 	struct request *current_request;
> 	wait_queue_head_t tx_wait;
>+	int corrupt;
> };
> 
> #endif /* __KERNEL__ */

Actions: View | Diff

Attachments on bug 449812: 308279