diff options
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 @@ | |||
1 | From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001 | 1 | Upstream-Status: Backport |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 18 Apr 2017 09:35:35 -0700 | ||
4 | Subject: [PATCH] replace __bzero() with memset() API | ||
5 | 3 | ||
6 | memset is available across all libc implementation | 4 | From 5356b63005e9d8169e0399cb76f26fbd29a78dee Mon Sep 17 00:00:00 2001 |
5 | From: Joshua Kinard <kumba@gentoo.org> | ||
6 | Date: Wed, 23 Aug 2017 14:31:36 -0400 | ||
7 | Subject: [PATCH] Replace bzero() calls with equivalent memset() calls | ||
7 | 8 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | As annotated in the bzero(3) man page, bzero() was marked as LEGACY in |
9 | --- | 10 | POSIX.1-2001 and removed in POSIX.1-2008, and should be replaced with |
10 | Upstream-Status: Pending | 11 | memset() calls to write zeros to a memory region. The attached patch |
12 | replaces two bzero() calls and one __bzero() call in libtirpc with | ||
13 | equivalent memset() calls. The latter replacement fixes a compile error | ||
14 | under uclibc-ng, which lacks a definition for __bzero() | ||
11 | 15 | ||
12 | src/des_impl.c | 2 +- | 16 | Signed-off-by: Joshua Kinard <kumba@gentoo.org> |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | Signed-off-by: Steve Dickson <steved@redhat.com> |
18 | --- | ||
19 | src/auth_time.c | 2 +- | ||
20 | src/des_impl.c | 2 +- | ||
21 | src/svc_auth_des.c | 2 +- | ||
22 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
14 | 23 | ||
24 | diff --git a/src/auth_time.c b/src/auth_time.c | ||
25 | index 7f83ab4..69400bc 100644 | ||
26 | --- a/src/auth_time.c | ||
27 | +++ b/src/auth_time.c | ||
28 | @@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) | ||
29 | sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4); | ||
30 | useua = &ipuaddr[0]; | ||
31 | |||
32 | - bzero((char *)&sin, sizeof(sin)); | ||
33 | + memset(&sin, 0, sizeof(sin)); | ||
34 | if (uaddr_to_sockaddr(useua, &sin)) { | ||
35 | msg("unable to translate uaddr to sockaddr."); | ||
36 | if (needfree) | ||
15 | diff --git a/src/des_impl.c b/src/des_impl.c | 37 | diff --git a/src/des_impl.c b/src/des_impl.c |
16 | index 9dbccaf..15bec2a 100644 | 38 | index 9dbccaf..15bec2a 100644 |
17 | --- a/src/des_impl.c | 39 | --- a/src/des_impl.c |
@@ -25,6 +47,18 @@ index 9dbccaf..15bec2a 100644 | |||
25 | 47 | ||
26 | return (1); | 48 | return (1); |
27 | } | 49 | } |
50 | diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c | ||
51 | index 2e90146..19a7c60 100644 | ||
52 | --- a/src/svc_auth_des.c | ||
53 | +++ b/src/svc_auth_des.c | ||
54 | @@ -356,7 +356,7 @@ cache_init() | ||
55 | |||
56 | authdes_cache = (struct cache_entry *) | ||
57 | mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ); | ||
58 | - bzero((char *)authdes_cache, | ||
59 | + memset(authdes_cache, 0, | ||
60 | sizeof(struct cache_entry) * AUTHDES_CACHESZ); | ||
61 | |||
62 | authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ); | ||
28 | -- | 63 | -- |
29 | 2.12.2 | 64 | 1.8.3.1 |
30 | |||