summaryrefslogtreecommitdiffstats
path: root/source/client/dnsbrowse.c
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2011-02-27 18:28:29 +0100
committerKarolin Seeger <kseeger@samba.org>2011-02-27 18:28:29 +0100
commit724e44eed299c618066dec411530aa9f156119ec (patch)
tree143e8ac3903ebff1b46382c5b0e89fc74a5d8eac /source/client/dnsbrowse.c
parent23ec2b1a988fff922864a03b6061c6bc2e584ce0 (diff)
downloadsamba-724e44eed299c618066dec411530aa9f156119ec.tar.gz
samba-724e44eed299c618066dec411530aa9f156119ec.tar.xz
samba-724e44eed299c618066dec411530aa9f156119ec.zip
Fix denial of service - memory corruption.
CVE-2011-0719 Fix bug #7949 (DoS in Winbind and smbd with many file descriptors open). All current released versions of Samba are vulnerable to a denial of service caused by memory corruption. Range checks on file descriptors being used in the FD_SET macro were not present allowing stack corruption. This can cause the Samba code to crash or to loop attempting to select on a bad file descriptor set. A connection to a file share, or a local account is needed to exploit this problem, either authenticated or unauthenticated (guest connection). Currently we do not believe this flaw is exploitable beyond a crash or causing the code to loop, but on the advice of our security reviewers we are releasing fixes in case an exploit is discovered at a later date.
Diffstat (limited to 'source/client/dnsbrowse.c')
-rw-r--r--source/client/dnsbrowse.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/source/client/dnsbrowse.c b/source/client/dnsbrowse.c
index 5e3a4de9cff..aa2fb22ad65 100644
--- a/source/client/dnsbrowse.c
+++ b/source/client/dnsbrowse.c
@@ -81,6 +81,11 @@ static void do_smb_resolve(struct mdns_smbsrv_result *browsesrv)
TALLOC_FREE(fdset);
}
+ if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
+ errno = EBADF;
+ break;
+ }
+
fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
fdset = TALLOC_ZERO(ctx, fdsetsz);
FD_SET(mdnsfd, fdset);
@@ -183,6 +188,13 @@ int do_smb_browse(void)
fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
fdset = TALLOC_ZERO(ctx, fdsetsz);
+
+ if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
+ errno = EBADF;
+ TALLOC_FREE(ctx);
+ return 1;
+ }
+
FD_SET(mdnsfd, fdset);
tv.tv_sec = 1;