Attachment 698109 Details for Bug 911878 – libcap-2.22-signed-sizeof-compare.patch

[patch] libcap-2.22-signed-sizeof-compare.patch

0001-Add-libcap-2.22-signed-sizeof-compare.patch-911878.patch (text/plain), 2.48 KB, created by Mark Wielaard on 2013-02-16 10:30:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Wielaard

Created: 2013-02-16 10:30:52 UTC

Size: 2.48 KB

patch

obsolete

>From 2244a03656ef67620ba2d88eef2f110e0162b4ae Mon Sep 17 00:00:00 2001
>From: Mark Wielaard <mjw@redhat.com>
>Date: Fri, 15 Feb 2013 11:27:19 +0100
>Subject: [PATCH] Add libcap-2.22-signed-sizeof-compare.patch (#911878)
>
>
>---
> libcap-2.22-signed-sizeof-compare.patch | 20 ++++++++++++++++++++
> libcap.spec                             |  8 +++++++-
> 2 files changed, 27 insertions(+), 1 deletion(-)
> create mode 100644 libcap-2.22-signed-sizeof-compare.patch
>
>diff --git a/libcap-2.22-signed-sizeof-compare.patch b/libcap-2.22-signed-sizeof-compare.patch
>new file mode 100644
>index 0000000..791e9a4
>--- /dev/null
>+++ b/libcap-2.22-signed-sizeof-compare.patch
>@@ -0,0 +1,20 @@
>+--- libcap-2.22/libcap/cap_file.c.orig	2013-02-16 10:18:37.765897015 +0100
>++++ libcap-2.22/libcap/cap_file.c	2013-02-16 10:38:55.025160233 +0100
>+@@ -187,7 +187,7 @@
>+ 	/* fill the capability sets via a system call */
>+ 	sizeofcaps = fgetxattr(fildes, XATTR_NAME_CAPS,
>+ 			       &rawvfscap, sizeof(rawvfscap));
>+-	if (sizeofcaps < sizeof(rawvfscap.magic_etc)) {
>++	if (sizeofcaps < (int) sizeof(rawvfscap.magic_etc)) {
>+ 	    cap_free(result);
>+ 	    result = NULL;
>+ 	} else {
>+@@ -217,7 +217,7 @@
>+ 	/* fill the capability sets via a system call */
>+ 	sizeofcaps = getxattr(filename, XATTR_NAME_CAPS,
>+ 			      &rawvfscap, sizeof(rawvfscap));
>+-	if (sizeofcaps < sizeof(rawvfscap.magic_etc)) {
>++	if (sizeofcaps < (int) sizeof(rawvfscap.magic_etc)) {
>+ 	    cap_free(result);
>+ 	    result = NULL;
>+ 	} else {
>diff --git a/libcap.spec b/libcap.spec
>index 4739c0d..9901ce4 100644
>--- a/libcap.spec
>+++ b/libcap.spec
>@@ -1,9 +1,11 @@
> Name: libcap
> Version: 2.22
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> Summary: Library for getting and setting POSIX.1e capabilities
> Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.bz2
> 
>+Patch0: libcap-2.22-signed-sizeof-compare.patch
>+
> URL: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
> License: LGPLv2+
> Group: System Environment/Libraries
>@@ -30,6 +32,7 @@ libcap.
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> %build
> # libcap can not be build with _smp_mflags:
>@@ -76,6 +79,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
> rm -rf ${RPM_BUILD_ROOT}
> 
> %changelog
>+* Fri Feb 16 2013 Mark Wielaard <mjw@redhat.com> 2.22-5
>+- Add libcap-2.22-signed-sizeof-compare.patch (#911878)
>+
> * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 911878: 698109