diff options
| author | Jiří Šašek <jiri.sasek@oracle.com> | 2018-12-06 14:10:53 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-03-05 07:39:27 +0000 |
| commit | 1cb278ddaea03c946ed9f32665517ffaec833823 (patch) | |
| tree | 12e2b40b454a2d0fae4891a7c9d296e9b9eb0163 | |
| parent | 8be2836cd825054ecffe112226400cdc42a2afc3 (diff) | |
| download | samba-1cb278ddaea03c946ed9f32665517ffaec833823.tar.gz | |
notifyd: Fix SIGBUS on sparc
Problem is the structure "struct notify_instance" can lay in message buffer on
address not dividable by 8 but this structure begins by uint_64 (secs in
time-stamp). Structure should be re-packed to standalone buffer before the use.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13704
Signed-off-by: jiri.sasek@oracle.com
Reviewed-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | source3/smbd/notifyd/notifyd.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c index e4e5c785472..4fcef508a91 100644 --- a/source3/smbd/notifyd/notifyd.c +++ b/source3/smbd/notifyd/notifyd.c @@ -575,6 +575,7 @@ static void notifyd_rec_change(struct messaging_context *msg_ctx, struct notify_rec_change_msg *msg; size_t pathlen; bool ok; + struct notify_instance instance; DBG_DEBUG("Got %zu bytes from %s\n", data->length, server_id_str_buf(src, &idbuf)); @@ -585,8 +586,10 @@ static void notifyd_rec_change(struct messaging_context *msg_ctx, return; } + memcpy(&instance, &msg->instance, sizeof(instance)); /* avoid SIGBUS */ + ok = notifyd_apply_rec_change( - &src, msg->path, pathlen, &msg->instance, + &src, msg->path, pathlen, &instance, state->entries, state->sys_notify_watch, state->sys_notify_ctx, state->msg_ctx); if (!ok) { @@ -1337,6 +1340,7 @@ static void notifyd_apply_reclog(struct notifyd_peer *peer, struct notify_rec_change_msg *chg; size_t pathlen; bool ok; + struct notify_instance instance; ok = notifyd_parse_rec_change(r->buf.data, r->buf.length, &chg, &pathlen); @@ -1346,8 +1350,11 @@ static void notifyd_apply_reclog(struct notifyd_peer *peer, goto fail; } + /* avoid SIGBUS */ + memcpy(&instance, &chg->instance, sizeof(instance)); + ok = notifyd_apply_rec_change(&r->src, chg->path, pathlen, - &chg->instance, peer->db, + &instance, peer->db, state->sys_notify_watch, state->sys_notify_ctx, state->msg_ctx); |