Attachment 1635 Details for Bug 3349 – More become_root/unbecome_root pairs necessary

[patch] More become_root/unbecome_root pairs necessary

oplock.diff (text/plain), 2.33 KB, created by Volker Lendecke on 2005-12-23 15:48:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2005-12-23 15:48:46 UTC

Size: 2.33 KB

patch

obsolete

>Index: smbd/open.c
>===================================================================
>--- smbd/open.c	(Revision 12435)
>+++ smbd/open.c	(Arbeitskopie)
>@@ -682,11 +682,15 @@
> 	}
> 
> 	if (delay_it) {
>+		BOOL ret;
> 		DEBUG(10, ("Sending break request to PID %s\n",
> 			   procid_str_static(&exclusive->pid)));
> 		exclusive->op_mid = get_current_mid();
>-		if (!message_send_pid(exclusive->pid, MSG_SMB_BREAK_REQUEST,
>-				      exclusive, sizeof(*exclusive), True)) {
>+		become_root();
>+		ret = message_send_pid(exclusive->pid, MSG_SMB_BREAK_REQUEST,
>+				       exclusive, sizeof(*exclusive), True);
>+		unbecome_root();
>+		if (!ret) {
> 			DEBUG(3, ("Could not send oplock break message\n"));
> 		}
> 		file_free(fsp);
>Index: smbd/close.c
>===================================================================
>--- smbd/close.c	(Revision 12435)
>+++ smbd/close.c	(Arbeitskopie)
>@@ -130,8 +130,10 @@
>  			 */
>  			schedule_deferred_open_smb_message(e->op_mid);
>  		} else {
>+			become_root();
>  			message_send_pid(e->pid, MSG_SMB_OPEN_RETRY,
>  					 e, sizeof(*e), True);
>+			unbecome_root();
>  		}
>  	}
> }
>Index: smbd/oplock.c
>===================================================================
>--- smbd/oplock.c	(Revision 12435)
>+++ smbd/oplock.c	(Arbeitskopie)
>@@ -398,8 +398,10 @@
> 		 * get to process this message, we have closed the file. Reply
> 		 * with 'ok, oplock broken' */
> 		DEBUG(3, ("Did not find fsp\n"));
>+		become_root();
> 		message_send_pid(src, MSG_SMB_BREAK_RESPONSE,
> 				 msg, sizeof(*msg), True);
>+		unbecome_root();
> 		return;
> 	}
> 
>@@ -418,8 +420,10 @@
> 		DEBUG(3, ("Already downgraded oplock on %.0f/%.0f: %s\n",
> 			  (double)fsp->dev, (double)fsp->inode,
> 			  fsp->fsp_name));
>+		become_root();
> 		message_send_pid(src, MSG_SMB_BREAK_RESPONSE,
> 				 msg, sizeof(*msg), True);
>+		unbecome_root();
> 		return;
> 	}
> 
>@@ -547,8 +551,10 @@
> 
> 	for (i=0; i<fsp->num_pending_break_messages; i++) {
> 		struct share_mode_entry *msg = &fsp->pending_break_messages[i];
>+		become_root();
> 		message_send_pid(msg->pid, MSG_SMB_BREAK_RESPONSE,
> 				 msg, sizeof(*msg), True);
>+		unbecome_root();
> 	}
> 
> 	SAFE_FREE(fsp->pending_break_messages);
>@@ -686,8 +692,10 @@
> 			abort();
> 		}
> 
>+		become_root();
> 		message_send_pid(share_entry->pid, MSG_SMB_ASYNC_LEVEL2_BREAK,
> 				 share_entry, sizeof(*share_entry), True);
>+		unbecome_root();
> 	}
> 
> 	remove_all_share_oplocks(lck, fsp);

Actions: View

Attachments on bug 3349: 1631 | 1632 | 1633 | 1634 | 1635