fixed upstream patch for rhbz#1328735

This commit is contained in:
Daniel Kopecek 2016-05-13 11:28:06 +02:00
parent c0063cebde
commit 333fe38779
2 changed files with 6 additions and 3 deletions

View File

@ -1,6 +1,6 @@
diff -up sudo-1.8.16/src/selinux.c.seshargsfix sudo-1.8.16/src/selinux.c
--- sudo-1.8.16/src/selinux.c.seshargsfix 2016-03-17 17:13:10.000000000 +0100
+++ sudo-1.8.16/src/selinux.c 2016-05-12 09:29:14.687014460 +0200
+++ sudo-1.8.16/src/selinux.c 2016-05-13 11:14:04.628296996 +0200
@@ -378,7 +378,7 @@ selinux_execve(int fd, const char *path,
{
char **nargv;
@ -35,7 +35,7 @@ diff -up sudo-1.8.16/src/selinux.c.seshargsfix sudo-1.8.16/src/selinux.c
- nargv[argc] = (char *)path;
- memcpy(&nargv[argc + 1], &argv[argc], argc * sizeof(char *)); /* copies NULL */
+ nargv[nargc++] = (char *)path;
+ memcpy(&nargv[nargc], &argv[argc], argc * sizeof(char *)); /* copies NULL */
+ memcpy(&nargv[nargc], &argv[1], argc * sizeof(char *)); /* copies NULL */
/* sesh will handle noexec for us. */
sudo_execve(-1, sesh, nargv, envp, false);

View File

@ -1,7 +1,7 @@
Summary: Allows restricted root access for specified users
Name: sudo
Version: 1.8.16
Release: 2%{?dist}
Release: 3%{?dist}
License: ISC
Group: Applications/System
URL: http://www.courtesan.com/sudo/
@ -201,6 +201,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/sudo/libsudo_util.so
%changelog
* Fri May 13 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-3
- fixed upstream patch for rhbz#1328735
* Thu May 12 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-2
- fixed invalid sesh argument array construction