Attachment 6671 Details for Bug 8292 – Metze's patch for 3.6.0.

[patch] Metze's patch for 3.6.0.

0001-s3-smb2_server-call-change_to_root_user-or-smbd_smb2.patch (text/plain), 3.37 KB, created by Jeremy Allison on 2011-07-07 21:27:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-07-07 21:27:43 UTC

Size: 3.37 KB

patch

obsolete

>From f2806cca536de82739b5e03d8f98c03cdcf14103 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 7 Jul 2011 16:38:33 +0200
>Subject: [PATCH] s3:smb2_server: call change_to_root_user() or smbd_smb2_request_check_tcon()
>
>For all requests which don't operate on a tcon, we should call
>change_to_root_user(), to match the SMB1 behavior.
>
>For SMB1 we do the following operations without AS_USER:
>
>/* 0x70 */ { "SMBtcon",reply_tcon,0},
>/* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR},
>/* 0x72 */ { "SMBnegprot",reply_negprot,0},
>/* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0},
>/* 0x74 */ { "SMBulogoffX",reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
>/* 0x75 */ { "SMBtconX",reply_tcon_and_X,0},
>...
>/* 0x2b */ { "SMBecho",reply_echo,0},
>...
>/* 0xa4 */ { "SMBntcancel",reply_ntcancel, 0 },
>
>For SMB2tdis we still call smbd_smb2_request_check_tcon()
>as close_cnum() calls change_to_root_user() when needed.
>
>metze
>---
> source3/smbd/smb2_server.c |   29 ++++++++++++++++++++++++++---
> 1 files changed, 26 insertions(+), 3 deletions(-)
>
>diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
>index 1bbb108..90f4767 100644
>--- a/source3/smbd/smb2_server.c
>+++ b/source3/smbd/smb2_server.c
>@@ -1139,6 +1139,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 
> 	switch (opcode) {
> 	case SMB2_OP_NEGPROT:
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
> 		{
> 			START_PROFILE(smb2_negprot);
> 			return_value = smbd_smb2_request_process_negprot(req);
>@@ -1147,6 +1150,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 		break;
> 
> 	case SMB2_OP_SESSSETUP:
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
> 		{
> 			START_PROFILE(smb2_sesssetup);
> 			return_value = smbd_smb2_request_process_sesssetup(req);
>@@ -1160,6 +1166,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 			break;
> 		}
> 
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
> 		{
> 			START_PROFILE(smb2_logoff);
> 			return_value = smbd_smb2_request_process_logoff(req);
>@@ -1173,6 +1182,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 			break;
> 		}
> 
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
> 		{
> 			START_PROFILE(smb2_tcon);
> 			return_value = smbd_smb2_request_process_tcon(req);
>@@ -1190,6 +1202,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 			return_value = smbd_smb2_request_error(req, status);
> 			break;
> 		}
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
> 
> 		{
> 			START_PROFILE(smb2_tdis);
>@@ -1333,6 +1348,9 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 		break;
> 
> 	case SMB2_OP_CANCEL:
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
> 		{
> 			START_PROFILE(smb2_cancel);
> 			return_value = smbd_smb2_request_process_cancel(req);
>@@ -1341,9 +1359,14 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 		break;
> 
> 	case SMB2_OP_KEEPALIVE:
>-		{START_PROFILE(smb2_keepalive);
>-		return_value = smbd_smb2_request_process_keepalive(req);
>-		END_PROFILE(smb2_keepalive);}
>+		/* This call needs to be run as root */
>+		change_to_root_user();
>+
>+		{
>+			START_PROFILE(smb2_keepalive);
>+			return_value = smbd_smb2_request_process_keepalive(req);
>+			END_PROFILE(smb2_keepalive);
>+		}
> 		break;
> 
> 	case SMB2_OP_FIND:
>-- 
>1.7.4.1
>

Actions: View

Attachments on bug 8292: 6669 | 6671 | 6672 | 6679