From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout.scc.kit.edu (scc-mailout.scc.kit.edu [129.13.185.202]) by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id pBK1HXF6006723 for ; Mon, 19 Dec 2011 20:17:34 -0500 (EST) Received: from hekate.usta.de (asta-nat.asta.uni-karlsruhe.de [172.22.63.82]) by scc-mailout-02.scc.kit.edu with esmtp (Exim 4.72 #1) id 1RcoKh-0000jk-Mj; Tue, 20 Dec 2011 02:17:31 +0100 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1RcoKh-0004Wv-PV for tech@mdocml.bsd.lv; Tue, 20 Dec 2011 02:17:31 +0100 Received: from iris.usta.de ([172.24.96.5] helo=usta.de) by donnerwolke.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1RcoKh-0004Ap-OJ for tech@mdocml.bsd.lv; Tue, 20 Dec 2011 02:17:31 +0100 Received: from schwarze by usta.de with local (Exim 4.72) (envelope-from ) id 1RcoKh-0005fw-NS for tech@mdocml.bsd.lv; Tue, 20 Dec 2011 02:17:31 +0100 Date: Tue, 20 Dec 2011 02:17:31 +0100 From: Ingo Schwarze To: tech@mdocml.bsd.lv Subject: Do not cast void pointers to pointers requiring alignment. Message-ID: <20111220011731.GB22316@iris.usta.de> X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) You want this, too? Ingo ----- Forwarded message from Ingo Schwarze ----- From: Ingo Schwarze Date: Mon, 19 Dec 2011 17:41:24 -0700 (MST) To: source-changes@cvs.openbsd.org Subject: CVS: cvs.openbsd.org: src CVSROOT: /cvs Module name: src Changes by: schwarze@cvs.openbsd.org 2011/12/19 17:41:24 Modified files: usr.bin/mandoc : apropos_db.c mandocdb.c Log message: Do not cast void pointers to pointers requiring alignment. This makes mandocdb(8)/apropos(1) work on strict alignment architectures. Basic way to fix this confirmed by deraadt@ and kettenis@, thanks. This now works on both sparc64 and i386, but note that the binary database format is still machine-dependent. ----- End forwarded message ----- Index: apropos_db.c =================================================================== RCS file: /cvs/src/usr.bin/mandoc/apropos_db.c,v retrieving revision 1.15 diff -u -p -r1.15 apropos_db.c --- apropos_db.c 19 Dec 2011 02:26:33 -0000 1.15 +++ apropos_db.c 20 Dec 2011 00:18:56 -0000 @@ -160,7 +160,7 @@ btree_read(const DBT *k, const DBT *v, const struct mchars *mc, struct db_val *dbv, char **buf) { - const struct db_val *vp; + struct db_val raw_dbv; /* Are our sizes sane? */ if (k->size < 2 || sizeof(struct db_val) != v->size) @@ -170,10 +170,10 @@ btree_read(const DBT *k, const DBT *v, if ('\0' != ((const char *)k->data)[(int)k->size - 1]) return(0); - vp = v->data; norm_string((const char *)k->data, mc, buf); - dbv->rec = betoh32(vp->rec); - dbv->mask = betoh64(vp->mask); + memcpy(&raw_dbv, v->data, v->size); + dbv->rec = betoh32(raw_dbv.rec); + dbv->mask = betoh64(raw_dbv.mask); return(1); } @@ -369,7 +369,8 @@ index_read(const DBT *key, const DBT *va return(0); cp = val->data; - rec->res.rec = *(recno_t *)key->data; + assert(sizeof(recno_t) == key->size); + memcpy(&rec->res.rec, key->data, key->size); rec->res.volume = index; if ('d' == (type = *cp++)) Index: mandocdb.c =================================================================== RCS file: /cvs/src/usr.bin/mandoc/mandocdb.c,v retrieving revision 1.26 diff -u -p -r1.26 mandocdb.c --- mandocdb.c 19 Dec 2011 02:26:33 -0000 1.26 +++ mandocdb.c 20 Dec 2011 00:18:58 -0000 @@ -518,6 +518,7 @@ index_merge(const struct of *of, struct struct mdoc *mdoc; struct man *man; const char *fn, *msec, *mtitle, *arch; + uint64_t mask; size_t sv; unsigned seq; struct db_val vbuf; @@ -648,7 +649,9 @@ index_merge(const struct of *of, struct seq = R_FIRST; while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) { seq = R_NEXT; - vbuf.mask = htobe64(*(uint64_t *)val.data); + assert(sizeof(uint64_t) == val.size); + memcpy(&mask, val.data, val.size); + vbuf.mask = htobe64(mask); val.size = sizeof(struct db_val); val.data = &vbuf; dbt_put(db, dbf, &key, &val); @@ -701,7 +704,8 @@ index_prune(const struct of *ofile, DB * seq = R_FIRST; while (0 == (ch = (*idx->seq)(idx, &key, &val, seq))) { seq = R_NEXT; - *maxrec = *(recno_t *)key.data; + assert(sizeof(recno_t) == key.size); + memcpy(maxrec, key.data, key.size); /* Deleted records are zero-sized. Skip them. */ @@ -1061,6 +1065,7 @@ pmdoc_Sh(MDOC_ARGS) static void hash_put(DB *db, const struct buf *buf, uint64_t mask) { + uint64_t oldmask; DBT key, val; int rc; @@ -1073,8 +1078,11 @@ hash_put(DB *db, const struct buf *buf, if ((rc = (*db->get)(db, &key, &val, 0)) < 0) { perror("hash"); exit((int)MANDOCLEVEL_SYSERR); - } else if (0 == rc) - mask |= *(uint64_t *)val.data; + } else if (0 == rc) { + assert(sizeof(uint64_t) == val.size); + memcpy(&oldmask, val.data, val.size); + mask |= oldmask; + } val.data = &mask; val.size = sizeof(uint64_t); -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv