Page MenuHomeFreeBSD

D61774.1795214259.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D61774.1795214259.diff

diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -4150,16 +4150,17 @@
sizeof(struct ffclock_estimate32))) != 0)
return (error);
- CP(cest.update_time, cest32.update_time, sec);
+ memset(&cest, 0, sizeof(cest));
+ CP(cest32.update_time, cest.update_time, sec);
memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t));
- FU64_CP(cest, cest32, update_ffcount);
- FU64_CP(cest, cest32, leapsec_next);
- FU64_CP(cest, cest32, period);
- CP(cest, cest32, errb_abs);
- CP(cest, cest32, errb_rate);
- CP(cest, cest32, status);
- CP(cest, cest32, leapsec_total);
- CP(cest, cest32, leapsec);
+ FU64_CP(cest32, cest, update_ffcount);
+ FU64_CP(cest32, cest, leapsec_next);
+ FU64_CP(cest32, cest, period);
+ CP(cest32, cest, errb_abs);
+ CP(cest32, cest, errb_rate);
+ CP(cest32, cest, status);
+ CP(cest32, cest, leapsec_total);
+ CP(cest32, cest, leapsec);
mtx_lock(&ffclock_mtx);
memcpy(&ffclock_estimate, &cest, sizeof(struct ffclock_estimate));
@@ -4180,16 +4181,17 @@
memcpy(&cest, &ffclock_estimate, sizeof(struct ffclock_estimate));
mtx_unlock(&ffclock_mtx);
- CP(cest32.update_time, cest.update_time, sec);
+ memset(&cest32, 0, sizeof(cest32));
+ CP(cest.update_time, cest32.update_time, sec);
memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t));
- FU64_CP(cest32, cest, update_ffcount);
- FU64_CP(cest32, cest, leapsec_next);
- FU64_CP(cest32, cest, period);
- CP(cest32, cest, errb_abs);
- CP(cest32, cest, errb_rate);
- CP(cest32, cest, status);
- CP(cest32, cest, leapsec_total);
- CP(cest32, cest, leapsec);
+ FU64_CP(cest, cest32, update_ffcount);
+ FU64_CP(cest, cest32, leapsec_next);
+ FU64_CP(cest, cest32, period);
+ CP(cest, cest32, errb_abs);
+ CP(cest, cest32, errb_rate);
+ CP(cest, cest32, status);
+ CP(cest, cest32, leapsec_total);
+ CP(cest, cest32, leapsec);
error = copyout(&cest32, uap->cest, sizeof(struct ffclock_estimate32));
return (error);

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 20, 10:37 PM (21 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41875814
Default Alt Text
D61774.1795214259.diff (2 KB)

Event Timeline