| 1 |
lxnay 10/05/10 11:26:09 |
| 2 |
|
| 3 |
Added: 3.5.2-backport-fix-ipv6-cifs-mount.patch |
| 4 |
3.5.2-backport-fix-smbclient-segfault.patch |
| 5 |
Log: |
| 6 |
fix two segfaults, see upstream bugs 7205, 7250. Patches have been backported, can be dropped when 3.5.3 is out |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/3.5.2-backport-fix-ipv6-cifs-mount.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 3.5.2-backport-fix-ipv6-cifs-mount.patch |
| 16 |
=================================================================== |
| 17 |
--- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000 |
| 18 |
+++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000 |
| 19 |
@@ -1563,7 +1563,7 @@ |
| 20 |
} |
| 21 |
} |
| 22 |
|
| 23 |
- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { |
| 24 |
+ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { |
| 25 |
strlcat(options, "%", options_size); |
| 26 |
current_len = strnlen(options, options_size); |
| 27 |
optionstail = options + current_len; |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/3.5.2-backport-fix-smbclient-segfault.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: 3.5.2-backport-fix-smbclient-segfault.patch |
| 37 |
=================================================================== |
| 38 |
From: Tim Prouty <tprouty@×××××.org> |
| 39 |
Date: Mon, 4 Jan 2010 20:57:34 +0000 (-0800) |
| 40 |
Subject: s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with ... |
| 41 |
X-Git-Tag: release-4-0-0alpha11~150 |
| 42 |
X-Git-Url: http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=34f0cff0664f1c160ee7442461e9f875e8d8f4dc;hp=dc689827114c46b3ca2a75082421dc2d98001ce7 |
| 43 |
|
| 44 |
s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with security=share |
| 45 |
--- |
| 46 |
|
| 47 |
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c |
| 48 |
index 31216b8..fa79ebc 100644 |
| 49 |
--- a/source3/libsmb/cliconnect.c |
| 50 |
+++ b/source3/libsmb/cliconnect.c |
| 51 |
@@ -1573,6 +1573,8 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx, |
| 52 |
char *tmp = NULL; |
| 53 |
uint8_t *bytes; |
| 54 |
|
| 55 |
+ *psmbreq = NULL; |
| 56 |
+ |
| 57 |
req = tevent_req_create(mem_ctx, &state, struct cli_tcon_andx_state); |
| 58 |
if (req == NULL) { |
| 59 |
return NULL; |
| 60 |
@@ -1708,6 +1710,9 @@ struct tevent_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx, |
| 61 |
if (req == NULL) { |
| 62 |
return NULL; |
| 63 |
} |
| 64 |
+ if (subreq == NULL) { |
| 65 |
+ return req; |
| 66 |
+ } |
| 67 |
status = cli_smb_req_send(subreq); |
| 68 |
if (!NT_STATUS_IS_OK(status)) { |
| 69 |
tevent_req_nterror(req, status); |
Archives