From: Mark Hatle <mark.hatle@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 15/21] fix libnl two parentheses bugs in lib/cache_mngr.c file
Date: Wed, 29 May 2013 10:09:57 -0500 [thread overview]
Message-ID: <1369840203-21898-16-git-send-email-mark.hatle@windriver.com> (raw)
In-Reply-To: <1369840203-21898-1-git-send-email-mark.hatle@windriver.com>
From: "Song.Li" <Song.Li@windriver.com>
there are two parentheses bugs in libnl /lib/cache_mngr.c file.
The parentheses doesn't make any sense,
This will cause the variable err get a bool value,
the correct value of variable err should be the return value
of the function which can be any integer value.
Signed-off-by: Song Li <Song.Li@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
...fix-lib-cache_mngr.c-two-parentheses-bugs.patch | 37 ++++++++++++++++++++++
meta/recipes-support/libnl/libnl_3.2.22.bb | 3 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch
diff --git a/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch b/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch
new file mode 100644
index 0000000..6b8fa10
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl/fix-lib-cache_mngr.c-two-parentheses-bugs.patch
@@ -0,0 +1,37 @@
+From 82fdf49c185fd5f3810781af9ef52aa6a52bf2df Mon Sep 17 00:00:00 2001
+From: "Song.Li" <Song.Li@windriver.com>
+Date: Thu, 28 Jun 2012 20:03:17 +0800
+Subject: [PATCH] fix lib/cache_mngr.c two parentheses bugs
+
+there are two parentheses bugs in libnl /lib/cache_mngr.c file.
+The parentheses doesn't make any sense,
+This will cause the variable err get a bool value,
+the correct value of variable err should be the return value
+of the function which can be any integer value.
+
+---
+ lib/cache_mngr.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Upstream-status: Pending
+
+diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c
+index dae8768..57cc1f9 100644
+--- a/lib/cache_mngr.c
++++ b/lib/cache_mngr.c
+@@ -150,10 +150,10 @@ int nl_cache_mngr_alloc(struct nl_sock *sk, int protocol, int flags,
+ /* Required to receive async event notifications */
+ nl_socket_disable_seq_check(mngr->cm_sock);
+
+- if ((err = nl_connect(mngr->cm_sock, protocol) < 0))
++ if ((err = nl_connect(mngr->cm_sock, protocol)) < 0)
+ goto errout;
+
+- if ((err = nl_socket_set_nonblocking(mngr->cm_sock) < 0))
++ if ((err = nl_socket_set_nonblocking(mngr->cm_sock)) < 0)
+ goto errout;
+
+ NL_DBG(1, "Allocated cache manager %p, protocol %d, %d caches\n",
+--
+1.7.9.5
+
diff --git a/meta/recipes-support/libnl/libnl_3.2.22.bb b/meta/recipes-support/libnl/libnl_3.2.22.bb
index 36e98e1..30f85b2 100644
--- a/meta/recipes-support/libnl/libnl_3.2.22.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.22.bb
@@ -11,7 +11,8 @@ DEPENDS = "flex-native bison-native"
SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
file://fix-pktloc_syntax_h-race.patch \
- file://fix-pc-file.patch "
+ file://fix-pc-file.patch \
+ file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch"
SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e"
SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b"
--
1.8.1.2.545.g2f19ada
next prev parent reply other threads:[~2013-05-29 15:03 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 15:09 [PATCH 0/21] Misc patch set Mark Hatle
2013-05-29 15:09 ` [PATCH 1/21] libxpm: inherit gettext Mark Hatle
2013-05-29 15:09 ` [PATCH 2/21] Add directory information to the pkgdata files Mark Hatle
2013-05-29 15:11 ` Paul Eggleton
2013-05-29 15:23 ` Mark Hatle
2013-05-29 15:59 ` Martin Jansa
2013-05-29 16:30 ` Mark Hatle
2013-05-29 17:36 ` Khem Raj
2013-05-29 19:59 ` Phil Blundell
2013-05-29 20:44 ` Mark Hatle
2013-05-30 8:29 ` Paul Eggleton
2013-05-30 8:33 ` Richard Purdie
2013-05-29 15:09 ` [PATCH 3/21] cmake.bbclass: modify construction of compiler flags Mark Hatle
2013-05-29 15:09 ` [PATCH 4/21] acpid: modify CFLAGS Mark Hatle
2013-05-29 15:09 ` [PATCH 5/21] libpam: Avoid wildcards in the SRC_URI Mark Hatle
2013-05-29 15:09 ` [PATCH 6/21] util-linux: Add ability to compile with nativesdk Mark Hatle
2013-05-29 15:09 ` [PATCH 7/21] dbus-glib: use BPN instead of PN Mark Hatle
2013-05-29 15:09 ` [PATCH 8/21] initscripts: let status return 0 when proc is running well Mark Hatle
2013-05-29 15:09 ` [PATCH 9/21] pull ldlinux.sys and isolinux.bin from correct places Mark Hatle
2013-05-29 15:09 ` [PATCH 10/21] ncurses, busybox, cml1.bbclass: Fix menuconfig display corruption Mark Hatle
2013-05-29 21:15 ` Richard Purdie
2013-05-29 15:09 ` [PATCH 11/21] guile: don't search for libreadline in host libdir Mark Hatle
2013-05-29 15:09 ` [PATCH 12/21] dpkg-native: Fix native perl path Mark Hatle
2013-05-29 15:09 ` [PATCH 13/21] qmake_base.bbclass:add linux-gnun32-oe-g++ to QMAKESPEC Mark Hatle
2013-05-29 15:09 ` [PATCH 14/21] portmap: /etc/init.d/portmap restart complains "command not found" Mark Hatle
2013-05-29 15:09 ` Mark Hatle [this message]
2013-05-29 15:09 ` [PATCH 16/21] bind: add ipv6 support Mark Hatle
2013-05-29 15:09 ` [PATCH 17/21] grep: fix for CVE-2012-5667 Mark Hatle
2013-05-29 21:21 ` Richard Purdie
2013-05-29 15:10 ` [PATCH 18/21] Fix problems expanding the IMAGE_INSTALL package groups Mark Hatle
2013-05-29 21:10 ` Richard Purdie
2013-05-29 21:28 ` Mark Hatle
2013-05-29 21:59 ` Richard Purdie
2013-05-30 10:46 ` Phil Blundell
2013-05-30 12:22 ` Mark Hatle
2013-05-30 20:10 ` Richard Purdie
2013-05-29 15:10 ` [PATCH 19/21] siteinfo.bbclass: Add mips64 common siteinfo Mark Hatle
2013-05-29 15:10 ` [PATCH 20/21] cracklib: Allow byte order patch to work on older Linux hosts Mark Hatle
2013-05-29 15:10 ` [PATCH 21/21] libarchive: Fix build dependencies Mark Hatle
2013-05-30 0:53 ` [PATCH 0/21] Misc patch set Saul Wold
2013-05-30 3:55 ` Mark Hatle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369840203-21898-16-git-send-email-mark.hatle@windriver.com \
--to=mark.hatle@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox