diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index 5816bbe3cc..a5db1403e5 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -1256,6 +1256,7 @@ SRXAFSCB_TellMeAboutYourself( struct rx_call *callp, } /* return all network interface addresses */ + memset(addr, 0, sizeof(*addr)); addr->numberOfInterfaces = cm_noIPAddr; addr->uuid = cm_data.Uuid; for ( i=0; i < cm_noIPAddr; i++ ) { diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c index 61b2a75b7a..038cddab21 100644 --- a/src/afs/afs_callback.c +++ b/src/afs/afs_callback.c @@ -306,6 +306,7 @@ SRXAFSCB_GetLock(struct rx_call *a_call, afs_int32 a_index, XSTATS_START_CMTIME(AFS_STATS_CM_RPCIDX_GETLOCK); AFS_STATCNT(SRXAFSCB_GetLock); + memset(a_result, 0, sizeof(*a_result)); nentries = sizeof(ltable) / sizeof(struct ltable); if (a_index < 0 || a_index >= nentries+afs_cellindex) { /* @@ -1618,6 +1619,7 @@ SRXAFSCB_TellMeAboutYourself(struct rx_call *a_call, ObtainReadLock(&afs_xinterface); /* return all network interface addresses */ + memset(addr, 0, sizeof(*addr)); addr->numberOfInterfaces = afs_cb_interface.numberOfInterfaces; addr->uuid = afs_cb_interface.uuid; for (i = 0; i < afs_cb_interface.numberOfInterfaces; i++) { diff --git a/src/budb/procs.c b/src/budb/procs.c index f2987d3115..f976ff3aa3 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -424,6 +424,7 @@ FillDumpEntry(struct ubik_trans *ut, dbadr da, void *rock) struct budb_dumpEntry *dump = (struct budb_dumpEntry *)rock; struct dump d, ad; + memset(dump, 0, sizeof(*dump)); if (dbread(ut, da, &d, sizeof(d))) return BUDB_IO; dump->id = ntohl(d.id); diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c index d41112a806..cc19e532d5 100644 --- a/src/butc/tcprocs.c +++ b/src/butc/tcprocs.c @@ -372,6 +372,9 @@ STC_ReadLabel(struct rx_call *acid, struct tc_tapeLabel *label, afs_uint32 *task { afs_int32 code; + memset(label, 0, sizeof(*label)); + /* Synchronous, so no "real" ID; don't send stack garbage on the wire */ + *taskId = 0; #ifdef xbsa if (CONF_XBSA) return (TC_BADTASK); /* ReadLabel does not apply if XBSA */ diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c index fbe46a49f9..db06b514fe 100644 --- a/src/butc/tcstatus.c +++ b/src/butc/tcstatus.c @@ -46,14 +46,13 @@ STC_GetStatus(struct rx_call *call, afs_uint32 taskId, statusP ptr; int retval = 0; + memset(statusPtr, 0, sizeof(*statusPtr)); if (callPermitted(call) == 0) return (TC_NOTPERMITTED); lock_Status(); ptr = findStatus(taskId); if (ptr) { - /* strcpy(statusPtr->status, ptr->status); */ - strcpy(statusPtr->taskName, ptr->taskName); strcpy(statusPtr->volumeName, ptr->volumeName); statusPtr->taskId = ptr->taskId; @@ -133,6 +132,7 @@ STC_ScanStatus(struct rx_call *call, afs_uint32 *taskId, statusP ptr = 0; dlqlinkP dlqPtr; + memset(statusPtr, 0, sizeof(*statusPtr)); if (callPermitted(call) == 0) return (TC_NOTPERMITTED); diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c index 315096a461..1c6c68f972 100644 --- a/src/kauth/kaprocs.c +++ b/src/kauth/kaprocs.c @@ -1700,6 +1700,7 @@ kamListEntry(struct rx_call *call, afs_int32 caller; struct kaentry tentry; + memset(name, 0, sizeof(*name)); COUNT_REQ(ListEntry); if ((code = InitAuthServ(&tt, LOCKREAD, this_op))) return code; diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index 3045ef45f5..4ce1cbf92f 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -651,7 +651,7 @@ idToName(struct rx_call *call, idlist *aid, namelist *aname, afs_int32 *cid) return 0; if (size < 0 || size > INT_MAX / PR_MAXNAMELEN) return PRTOOMANY; - aname->namelist_val = malloc(size * PR_MAXNAMELEN); + aname->namelist_val = calloc(size, PR_MAXNAMELEN); aname->namelist_len = 0; if (aname->namelist_val == 0) return PRNOMEM; @@ -1538,6 +1538,7 @@ put_prentries(struct prentry *tentry, prentries *bulkentries) entry = bulkentries->prentries_val; entry += bulkentries->prentries_len; + memset(entry, 0, sizeof(*entry)); entry->flags = tentry->flags >> PRIVATE_SHIFT; if (entry->flags == 0) { entry->flags = @@ -1552,7 +1553,6 @@ put_prentries(struct prentry *tentry, prentries *bulkentries) entry->nusers = tentry->nusers; entry->count = tentry->count; strncpy(entry->name, tentry->name, PR_MAXNAMELEN); - memset(entry->reserved, 0, sizeof(entry->reserved)); bulkentries->prentries_len++; return 0; } diff --git a/src/ubik/vote.c b/src/ubik/vote.c index 3b771f0bc8..34f285dcd2 100644 --- a/src/ubik/vote.c +++ b/src/ubik/vote.c @@ -405,6 +405,7 @@ SVOTE_Debug(struct rx_call * rxcall, struct ubik_debug * aparm) /* fill in the basic debug structure. Note the the RPC protocol transfers, * integers in host order. */ + memset(aparm, 0, sizeof(*aparm)); aparm->now = FT_ApproxTime(); aparm->lastYesTime = vote_globals.ubik_lastYesTime; aparm->lastYesHost = ntohl(vote_globals.lastYesHost); diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c index 07ba5b46e0..3947803197 100644 --- a/src/volser/volprocs.c +++ b/src/volser/volprocs.c @@ -382,6 +382,7 @@ SAFSVolPartitionInfo(struct rx_call *acid, char *pname, struct diskPartition afs_int32 code; struct diskPartition64 *dp = malloc(sizeof(struct diskPartition64)); + memset(partition, 0, sizeof(*partition)); code = VolPartitionInfo(acid, pname, dp); if (!code) { strncpy(partition->name, dp->name, 32); @@ -401,6 +402,7 @@ SAFSVolPartitionInfo64(struct rx_call *acid, char *pname, struct diskPartition64 { afs_int32 code; + memset(partition, 0, sizeof(*partition)); code = VolPartitionInfo(acid, pname, partition); osi_auditU(acid, VS_ParInfEvent, code, AUD_STR, pname, AUD_END); return code; @@ -2806,6 +2808,7 @@ VolMonitor(struct rx_call *acid, transDebugEntries *transInfo) goto done; /*no active transactions */ for (tt = allTrans; tt; tt = nt) { /*copy relevant info into pntr */ nt = tt->next; + memset(pntr, 0, sizeof(*pntr)); VTRANS_OBJ_LOCK(tt); pntr->tid = tt->tid; pntr->time = tt->time;