blob: 7ae19cb319641687b42b64f6efa1caa6a6331910 [file] [log] [blame]
Brad Bishop00111322018-04-01 22:23:53 -04001Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -05003
Brad Bishop00111322018-04-01 22:23:53 -04004From 5356b63005e9d8169e0399cb76f26fbd29a78dee Mon Sep 17 00:00:00 2001
5From: Joshua Kinard <kumba@gentoo.org>
6Date: Wed, 23 Aug 2017 14:31:36 -0400
7Subject: [PATCH] Replace bzero() calls with equivalent memset() calls
Brad Bishopd7bf8c12018-02-25 22:55:05 -05008
Brad Bishop00111322018-04-01 22:23:53 -04009As annotated in the bzero(3) man page, bzero() was marked as LEGACY in
10POSIX.1-2001 and removed in POSIX.1-2008, and should be replaced with
11memset() calls to write zeros to a memory region. The attached patch
12replaces two bzero() calls and one __bzero() call in libtirpc with
13equivalent memset() calls. The latter replacement fixes a compile error
14under uclibc-ng, which lacks a definition for __bzero()
15
16Signed-off-by: Joshua Kinard <kumba@gentoo.org>
17Signed-off-by: Steve Dickson <steved@redhat.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050018---
Brad Bishop00111322018-04-01 22:23:53 -040019 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(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023
Brad Bishop00111322018-04-01 22:23:53 -040024diff --git a/src/auth_time.c b/src/auth_time.c
25index 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)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050037diff --git a/src/des_impl.c b/src/des_impl.c
38index 9dbccaf..15bec2a 100644
39--- a/src/des_impl.c
40+++ b/src/des_impl.c
41@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
42 }
43 tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
44 tbuf[0] = tbuf[1] = 0;
45- __bzero (schedule, sizeof (schedule));
46+ memset (schedule, 0, sizeof (schedule));
47
48 return (1);
49 }
Brad Bishop00111322018-04-01 22:23:53 -040050diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c
51index 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);
Brad Bishopd7bf8c12018-02-25 22:55:05 -050063--
Brad Bishop00111322018-04-01 22:23:53 -0400641.8.3.1