Compare commits

..

No commits in common. "c9s" and "c8" have entirely different histories.
c9s ... c8

9 changed files with 26 additions and 128 deletions

View File

@ -1 +0,0 @@
1

4
.gitignore vendored
View File

@ -1,3 +1 @@
/libmnl-1.0.2.tar.bz2 SOURCES/libmnl-1.0.4.tar.bz2
/libmnl-1.0.3.tar.bz2
/libmnl-1.0.4.tar.bz2

1
.libmnl.metadata Normal file
View File

@ -0,0 +1 @@
2db40dea612e88c62fd321906be40ab5f8f1685a SOURCES/libmnl-1.0.4.tar.bz2

View File

@ -1,49 +0,0 @@
From 387193faf4e8216ef201f2c685f69f6fa766ec46 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Sun, 18 Mar 2018 19:33:27 +0100
Subject: [PATCH] libmnl: zero attribute padding
Sergei Trofimovich reports 'uninitialized bytes' warnings from nftables:
Syscall param sendmsg(msg.msg_iov[0]) points to uninitialised byte(s)
at 0x55B9EFB: sendmsg (in /lib64/libc-2.25.so)
by 0x43E658: mnl_nft_socket_sendmsg (mnl.c:239)
by 0x43E658: mnl_batch_talk (mnl.c:254)
by 0x407898: nft_netlink (libnftables.c:58)
by 0x407898: nft_run (libnftables.c:96)
by 0x407CD5: nft_run_cmd_from_buffer (libnftables.c:291)
by 0x406EDE: main (main.c:274)
This is harmless, the uninitialized memory is the padding
that sometimes needs to be inserted between end of an attribute
and the beginning of the new attribute.
Zero it to silence memory sanitizer output.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 37c876b55a2c00424ccda5a300ab5fdec1d88b22)
---
src/attr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/attr.c b/src/attr.c
index 4f131874c11e4..0359ba959d7a0 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -412,10 +412,15 @@ void mnl_attr_put(struct nlmsghdr *nlh, uint16_t type, size_t len,
{
struct nlattr *attr = mnl_nlmsg_get_payload_tail(nlh);
uint16_t payload_len = MNL_ALIGN(sizeof(struct nlattr)) + len;
+ int pad;
attr->nla_type = type;
attr->nla_len = payload_len;
memcpy(mnl_attr_get_payload(attr), data, len);
+ pad = MNL_ALIGN(len) - len;
+ if (pad > 0)
+ memset(mnl_attr_get_payload(attr) + len, 0, pad);
+
nlh->nlmsg_len += MNL_ALIGN(payload_len);
}

View File

@ -1,16 +1,12 @@
Name: libmnl Name: libmnl
Version: 1.0.4 Version: 1.0.4
Release: 16%{?dist} Release: 6%{?dist}
Summary: A minimalistic Netlink library Summary: A minimalistic Netlink library
License: LGPLv2+ Group: System Environment/Libraries
URL: http://netfilter.org/projects/libmnl License: LGPLv2+
Source0: http://netfilter.org/projects/libmnl/files/%{name}-%{version}.tar.bz2 URL: http://netfilter.org/projects/libmnl
Source0: http://netfilter.org/projects/libmnl/files/%{name}-%{version}.tar.bz2
Patch01: 0001-libmnl-zero-attribute-padding.patch
BuildRequires: gcc
BuildRequires: make
%description %description
libmnl is a minimalistic user-space library oriented to Netlink developers. libmnl is a minimalistic user-space library oriented to Netlink developers.
@ -20,12 +16,14 @@ This library aims to provide simple helpers that allows you to re-use code and
to avoid re-inventing the wheel. to avoid re-inventing the wheel.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}%{_isa} = %{version}-%{release} Group: Development/Libraries
Requires: %{name}%{_isa} = %{version}-%{release}
%package static %package static
Summary: Static development files for %{name} Summary: Static development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description devel %description devel
@ -37,7 +35,7 @@ The %{name}-static package contains static libraries for devleoping applications
%prep %prep
%autosetup -p1 %setup -q
%build %build
@ -47,21 +45,26 @@ make CFLAGS="%{optflags}" %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -delete find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find examples '(' -name 'Makefile.am' -o -name 'Makefile.in' ')' -delete find examples '(' -name 'Makefile.am' -o -name 'Makefile.in' ')' -exec rm -f {} ';'
find examples -type d -name '.deps' -prune -exec rm -rf {} ';' find examples -type d -name '.deps' -prune -exec rm -rf {} ';'
mv examples examples-%{_arch} mv examples examples-%{_arch}
%ldconfig_scriptlets %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc README %doc README
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files devel %files devel
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc examples-%{_arch} %doc examples-%{_arch}
%{_includedir}/* %{_includedir}/*
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
@ -71,37 +74,6 @@ mv examples examples-%{_arch}
%{_libdir}/*.a %{_libdir}/*.a
%changelog %changelog
* Thu May 09 2024 Phil Sutter <psutter@redhat.com> - 1.0.4-16
- libmnl: zero attribute padding
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.4-15
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.4-14
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 21 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.4-1
- Add gcc BuildReq, cleanup spec
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.4-6 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.4-6
- Escape macros in %%changelog - Escape macros in %%changelog

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,10 +0,0 @@
summary: Internal Tier1-gating beakerlib tests
discover:
how: fmf
url: https://pkgs.devel.redhat.com/git/tests/libmnl
filter: 'tag: CI-gating & tag: -destructive'
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

View File

@ -1,6 +0,0 @@
summary: sanity chcek for libmnl
execute:
script: rpm -qv libmnl
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

View File

@ -1 +0,0 @@
be9b4b5328c6da1bda565ac5dffadb2d libmnl-1.0.4.tar.bz2