diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-02-20 00:46:52 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
| commit | 1b674cc1df9e919d61ad45668b0dd3221b9b3544 (patch) | |
| tree | 20910b6d0b7380a48066cb863d59414dcc60927b /meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch | |
| parent | a6e786e7c8bed33fa269aac99724df606829ec6f (diff) | |
| download | openembedded-core-contrib-1b674cc1df9e919d61ad45668b0dd3221b9b3544.tar.gz | |
libtirpc: refresh patches
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch')
| -rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch index d2b4da6ae2..7ae19cb319 100644 --- a/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch @@ -1,17 +1,39 @@ -From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 18 Apr 2017 09:35:35 -0700 -Subject: [PATCH] replace __bzero() with memset() API +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> -memset is available across all libc implementation +From 5356b63005e9d8169e0399cb76f26fbd29a78dee Mon Sep 17 00:00:00 2001 +From: Joshua Kinard <kumba@gentoo.org> +Date: Wed, 23 Aug 2017 14:31:36 -0400 +Subject: [PATCH] Replace bzero() calls with equivalent memset() calls -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending +As annotated in the bzero(3) man page, bzero() was marked as LEGACY in +POSIX.1-2001 and removed in POSIX.1-2008, and should be replaced with +memset() calls to write zeros to a memory region. The attached patch +replaces two bzero() calls and one __bzero() call in libtirpc with +equivalent memset() calls. The latter replacement fixes a compile error +under uclibc-ng, which lacks a definition for __bzero() - src/des_impl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Signed-off-by: Joshua Kinard <kumba@gentoo.org> +Signed-off-by: Steve Dickson <steved@redhat.com> +--- + src/auth_time.c | 2 +- + src/des_impl.c | 2 +- + src/svc_auth_des.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/src/auth_time.c b/src/auth_time.c +index 7f83ab4..69400bc 100644 +--- a/src/auth_time.c ++++ b/src/auth_time.c +@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) + sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4); + useua = &ipuaddr[0]; + +- bzero((char *)&sin, sizeof(sin)); ++ memset(&sin, 0, sizeof(sin)); + if (uaddr_to_sockaddr(useua, &sin)) { + msg("unable to translate uaddr to sockaddr."); + if (needfree) diff --git a/src/des_impl.c b/src/des_impl.c index 9dbccaf..15bec2a 100644 --- a/src/des_impl.c @@ -25,6 +47,18 @@ index 9dbccaf..15bec2a 100644 return (1); } +diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c +index 2e90146..19a7c60 100644 +--- a/src/svc_auth_des.c ++++ b/src/svc_auth_des.c +@@ -356,7 +356,7 @@ cache_init() + + authdes_cache = (struct cache_entry *) + mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ); +- bzero((char *)authdes_cache, ++ memset(authdes_cache, 0, + sizeof(struct cache_entry) * AUTHDES_CACHESZ); + + authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ); -- -2.12.2 - +1.8.3.1 |