00db10
commit 3cb26316b45b23dc5cfecbafdc489b28c3a52029
00db10
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
00db10
Date:   Thu Jan 29 10:30:09 2015 +0530
00db10
00db10
    Initialize nscd stats data [BZ #17892]
00db10
    
00db10
    The padding bytes in the statsdata struct are not initialized, due to
00db10
    which valgrind throws a warning:
00db10
    
00db10
    ==11384== Memcheck, a memory error detector
00db10
    ==11384== Copyright (C) 2002-2012, and GNU GPL'd, by Julian Seward et al.
00db10
    ==11384== Using Valgrind-3.8.1 and LibVEX; rerun with -h for copyright info
00db10
    ==11384== Command: nscd -d
00db10
    ==11384==
00db10
    Fri 25 Apr 2014 10:34:53 AM CEST - 11384: handle_request: request received (Version = 2) from PID 11396
00db10
    Fri 25 Apr 2014 10:34:53 AM CEST - 11384:       GETSTAT
00db10
    ==11384== Thread 6:
00db10
    ==11384== Syscall param socketcall.sendto(msg) points to uninitialised byte(s)
00db10
    ==11384==    at 0x4E4ACDC: send (in /lib64/libpthread-2.12.so)
00db10
    ==11384==    by 0x11AF6B: send_stats (in /usr/sbin/nscd)
00db10
    ==11384==    by 0x112F75: nscd_run_worker (in /usr/sbin/nscd)
00db10
    ==11384==    by 0x4E439D0: start_thread (in /lib64/libpthread-2.12.so)
00db10
    ==11384==    by 0x599AB6C: clone (in /lib64/libc-2.12.so)
00db10
    ==11384==  Address 0x15708395 is on thread 6's stack
00db10
    
00db10
    Fix the warning by initializing the structure.
00db10
00db10
diff --git glibc-2.17-c758a686/nscd/nscd_stat.c glibc-2.17-c758a686/nscd/nscd_stat.c
00db10
index 0f1f3c0..7aaa21b 100644
00db10
--- glibc-2.17-c758a686/nscd/nscd_stat.c
00db10
+++ glibc-2.17-c758a686/nscd/nscd_stat.c
00db10
@@ -94,6 +94,8 @@ send_stats (int fd, struct database_dyn dbs[lastdb])
00db10
   struct statdata data;
00db10
   int cnt;
00db10
 
00db10
+  memset (&data, 0, sizeof (data));
00db10
+
00db10
   memcpy (data.version, compilation, sizeof (compilation));
00db10
   data.debug_level = debug_level;
00db10
   data.runtime = time (NULL) - start_time;