Fix segfault when address list is exhausted (BZ#583230)
This commit is contained in:
parent
db9f70dfda
commit
8e899d49e2
@ -0,0 +1,34 @@
|
|||||||
|
From 1876123958c3afd44becce0427755257ddf87db9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeff Layton <jlayton@samba.org>
|
||||||
|
Date: Wed, 14 Apr 2010 14:11:37 -0400
|
||||||
|
Subject: [PATCH] mount.cifs: check for NULL pointer before calling strchr()
|
||||||
|
|
||||||
|
mount.cifs calls strchr on currentaddress, which may be a NULL pointer.
|
||||||
|
|
||||||
|
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
||||||
|
---
|
||||||
|
mount.cifs.c | 8 +++++---
|
||||||
|
1 files changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/mount.cifs.c b/mount.cifs.c
|
||||||
|
index acab8c8..f3aa464 100644
|
||||||
|
--- a/mount.cifs.c
|
||||||
|
+++ b/mount.cifs.c
|
||||||
|
@@ -1730,9 +1730,11 @@ mount_retry:
|
||||||
|
case ECONNREFUSED:
|
||||||
|
case EHOSTUNREACH:
|
||||||
|
currentaddress = nextaddress;
|
||||||
|
- nextaddress = strchr(currentaddress, ',');
|
||||||
|
- if (nextaddress)
|
||||||
|
- *nextaddress++ = '\0';
|
||||||
|
+ if (currentaddress) {
|
||||||
|
+ nextaddress = strchr(currentaddress, ',');
|
||||||
|
+ if (nextaddress)
|
||||||
|
+ *nextaddress++ = '\0';
|
||||||
|
+ }
|
||||||
|
goto mount_retry;
|
||||||
|
case ENODEV:
|
||||||
|
fprintf(stderr,
|
||||||
|
--
|
||||||
|
1.6.6.1
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: cifs-utils
|
Name: cifs-utils
|
||||||
Version: 4.3
|
Version: 4.3
|
||||||
Release: 1%{pre_release}%{?dist}
|
Release: 2%{pre_release}%{?dist}
|
||||||
Summary: Utilities for mounting and managing CIFS mounts
|
Summary: Utilities for mounting and managing CIFS mounts
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -16,6 +16,8 @@ Source0: ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}
|
|||||||
BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake
|
BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake
|
||||||
Requires: keyutils
|
Requires: keyutils
|
||||||
|
|
||||||
|
Patch1: cifs-utils-4.3-check-for-NULL-pointer-before-calling-str.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The SMB/CIFS protocol is a standard file sharing protocol widely deployed
|
The SMB/CIFS protocol is a standard file sharing protocol widely deployed
|
||||||
on Microsoft Windows machines. This package contains tools for mounting
|
on Microsoft Windows machines. This package contains tools for mounting
|
||||||
@ -27,6 +29,8 @@ file system.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}%{pre_release}
|
%setup -q -n %{name}-%{version}%{pre_release}
|
||||||
|
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --prefix=/usr
|
%configure --prefix=/usr
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
@ -47,6 +51,9 @@ rm -rf %{buildroot}
|
|||||||
%{_mandir}/man8/mount.cifs.8.gz
|
%{_mandir}/man8/mount.cifs.8.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Apr 17 2010 Jeff Layton <jlayton@redhat.com> 4.3-2
|
||||||
|
- fix segfault when address list is exhausted (BZ#583230)
|
||||||
|
|
||||||
* Fri Apr 09 2010 Jeff Layton <jlayton@redhat.com> 4.3-1
|
* Fri Apr 09 2010 Jeff Layton <jlayton@redhat.com> 4.3-1
|
||||||
- update to 4.3
|
- update to 4.3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user