Attachment 8125 Details for Bug 9341 – Patch from master (applies cleanly to v4-0-test)

[patch] Patch from master (applies cleanly to v4-0-test)

0001-s3-smb2_read-fix-SMBD_SMB2_NUM_IOV_PER_REQ-check-for.patch (text/plain), 1.27 KB, created by Michael Adam on 2012-11-01 13:11:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2012-11-01 13:11:43 UTC

Size: 1.27 KB

patch

obsolete

>From d8fc4cd25e40164e23c0375b073cb42723892146 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 30 Oct 2012 11:08:19 +0100
>Subject: [PATCH] s3:smb2_read: fix SMBD_SMB2_NUM_IOV_PER_REQ check for
> sendfile() support (bug #9341)
>
>Reported-by: Sebastien LAVEZE <sebastien.laveze@mindspeed.com>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Tested-by: Sebastien LAVEZE <sebastien.laveze@mindspeed.com>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Tue Oct 30 16:49:26 CET 2012 on sn-devel-104
>---
> source3/smbd/smb2_read.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
>index 2890f86..41adb03 100644
>--- a/source3/smbd/smb2_read.c
>+++ b/source3/smbd/smb2_read.c
>@@ -277,7 +277,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req,
> 	if (!lp__use_sendfile(SNUM(fsp->conn)) ||
> 	    smb2req->do_signing ||
> 	    smb2req->do_encryption ||
>-	    smb2req->in.vector_count < (2*SMBD_SMB2_NUM_IOV_PER_REQ) ||
>+	    smb2req->in.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ) ||
> 	    (fsp->base_fsp != NULL) ||
> 	    (fsp->wcp != NULL) ||
> 	    (!S_ISREG(fsp->fsp_name->st.st_ex_mode)) ||
>-- 
>1.7.9.5
>

Flags:

metze: review+
vl: review+

Actions: View

Attachments on bug 9341: 8125