[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  8fec359 vfs_fruit: Fix CID 1311244 Out-of-bounds read
      from  bba1771 Treat uid_t, git_t as 64 bit in Pidl Python bindings

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8fec35994c8b880c681f14291194763759e1c24d
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jul 7 09:04:22 2015 +0200

    vfs_fruit: Fix CID 1311244 Out-of-bounds read
    
    We should not call memcpy if the offset is exactly AFP_INFO_SIZE
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Tue Jul  7 14:04:39 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_fruit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index d05d786..e29440b 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2624,7 +2624,7 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
 		char afpinfo_buf[AFP_INFO_SIZE];
 		size_t to_return;
 
-		if ((offset < 0) || (offset > AFP_INFO_SIZE)) {
+		if ((offset < 0) || (offset >= AFP_INFO_SIZE)) {
 			len = 0;
 			rc = 0;
 			goto exit;


-- 
Samba Shared Repository