All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yu, Mingli" <mingli.yu@windriver.com>
To: Khem Raj <raj.khem@gmail.com>
Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
Subject: Re: [meta-oe][PATCH] librelp: Upgrade to 1.2.16
Date: Mon, 30 Jul 2018 09:35:44 +0800	[thread overview]
Message-ID: <5B5E6B70.9090307@windriver.com> (raw)
In-Reply-To: <CAMKF1so9XxBM8_QdOR73kpME0u8HfLhBZyDaLL_LR_F2WnQhuQ@mail.gmail.com>



On 2018年07月27日 22:17, Khem Raj wrote:
> fails with security_flags turned on

Will fix it in V2.

Thanks,

>
> | ../../git/src/tcp.c:352:57: error: '%s' directive output may be
> truncated writing up to 1024 bytes into a region of size 1011
> [-Werror=format-truncation=]
> |      snprintf((char*)szHname, NI_MAXHOST, "[MALICIOUS:IP=%s]", szIP);
> |                                                          ^~    ~~~~
> | In file included from
> /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/librelp/1.2.16-r0/recipe-sysroot/usr/include/stdio.h:862,
> |                  from ../../git/src/tcp.c:38:
> | /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/librelp/1.2.16-r0/recipe-sysroot/usr/include/bits/stdio2.h:64:10:
> note: '__builtin___snprintf_chk' output between 16 and 1040 bytes into
> a destination of size 1025
> |    return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
> |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> |         __bos (__s), __fmt, __va_arg_pack ());
> |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> | cc1: all warnings being treated as errors
> | make[2]: *** [Makefile:536: librelp_la-tcp.lo] Error 1
> On Tue, Jul 24, 2018 at 2:39 AM <mingli.yu@windriver.com> wrote:
>>
>> From: Mingli Yu <mingli.yu@windriver.com>
>>
>> Add 0001-src-tcp.c-fix-jump-misses-init-error.patch
>> to fix -Werror=jump-misses-init error
>>
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> ---
>>   ...src-tcp.c-fix-jump-misses-init-error.patch | 71 +++++++++++++++++++
>>   .../{librelp_1.2.14.bb => librelp_1.2.16.bb}  |  6 +-
>>   2 files changed, 75 insertions(+), 2 deletions(-)
>>   create mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch
>>   rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.14.bb => librelp_1.2.16.bb} (59%)
>>
>> diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch
>> new file mode 100644
>> index 000000000..68b686346
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch
>> @@ -0,0 +1,71 @@
>> +From 3e5a0cb440c788e2383e40ab23ac1cf01d96961b Mon Sep 17 00:00:00 2001
>> +From: Mingli Yu <mingli.yu@windriver.com>
>> +Date: Tue, 24 Jul 2018 01:30:25 -0700
>> +Subject: [PATCH] src/tcp.c: fix jump-misses-init error
>> +
>> +Fix below jump-misses-init error
>> +
>> +| In file included from ../../git/src/tcp.c:51:
>> +| ../../git/src/tcp.c: In function 'relpTcpConnect':
>> +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init]
>> +|    goto finalize_it;  \
>> +|    ^~~~
>> +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE'
>> +|    ABORT_FINALIZE(RELP_RET_IO_ERR);
>> +|    ^~~~~~~~~~~~~~
>> +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here
>> +|  finalize_it:
>> +|  ^~~~~~~~~~~
>> +| ../../git/src/tcp.c:1991:6: note: 'r' declared here
>> +|   int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len);
>> +|       ^
>> +| In file included from ../../git/src/tcp.c:51:
>> +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init]
>> +|    goto finalize_it;  \
>> +|    ^~~~
>> +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE'
>> +|    ABORT_FINALIZE(RELP_RET_IO_ERR);
>> +|    ^~~~~~~~~~~~~~
>> +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here
>> +|  finalize_it:
>> +|  ^~~~~~~~~~~
>> +| ../../git/src/tcp.c:1989:12: note: 'len' declared here
>> +|   socklen_t len = sizeof so_error;
>> +|             ^~~
>> +
>> +Upstream-Status: Submitted[https://github.com/rsyslog/librelp/pull/117]
>> +
>> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> +---
>> + src/tcp.c | 7 ++++---
>> + 1 file changed, 4 insertions(+), 3 deletions(-)
>> +
>> +diff --git a/src/tcp.c b/src/tcp.c
>> +index f35eb84..fb34dc7 100644
>> +--- a/src/tcp.c
>> ++++ b/src/tcp.c
>> +@@ -1936,6 +1936,9 @@ relpTcpConnect(relpTcp_t *const pThis,
>> +       struct addrinfo hints;
>> +       struct addrinfo *reslocal = NULL;
>> +       struct pollfd pfd;
>> ++      int so_error;
>> ++      socklen_t len = sizeof so_error;
>> ++      int r;
>> +
>> +       ENTER_RELPFUNC;
>> +       RELPOBJ_assert(pThis, Tcp);
>> +@@ -1985,10 +1988,8 @@ relpTcpConnect(relpTcp_t *const pThis,
>> +               ABORT_FINALIZE(RELP_RET_TIMED_OUT);
>> +       }
>> +
>> +-      int so_error;
>> +-      socklen_t len = sizeof so_error;
>> +
>> +-      int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len);
>> ++      r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len);
>> +       if (r == -1 || so_error != 0) {
>> +               pThis->pEngine->dbgprint("socket has an error %d\n", so_error);
>> +               ABORT_FINALIZE(RELP_RET_IO_ERR);
>> +--
>> +2.17.1
>> +
>> diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.2.16.bb
>> similarity index 59%
>> rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb
>> rename to meta-oe/recipes-extended/rsyslog/librelp_1.2.16.bb
>> index 28047eb54..6c68f6040 100644
>> --- a/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb
>> +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.2.16.bb
>> @@ -6,9 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9"
>>
>>   DEPENDS = "gmp nettle libidn zlib gnutls"
>>
>> -SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https"
>> +SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \
>> +           file://0001-src-tcp.c-fix-jump-misses-init-error.patch \
>> +"
>>
>> -SRCREV = "fc512e337bfc7c92770246dbff5f482b879498b9"
>> +SRCREV = "5e849ff060be0c7dce972e194c54fdacfee0adc2"
>>
>>   S = "${WORKDIR}/git"
>>
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


  reply	other threads:[~2018-07-30  1:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-24  9:38 [meta-oe][PATCH] librelp: Upgrade to 1.2.16 mingli.yu
2018-07-27 14:17 ` Khem Raj
2018-07-30  1:35   ` Yu, Mingli [this message]
2018-07-31  1:40     ` [meta-oe][PATCH v2] " mingli.yu

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=5B5E6B70.9090307@windriver.com \
    --to=mingli.yu@windriver.com \
    --cc=openembedded-devel@lists.openembedded.org \
    --cc=raj.khem@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.