d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hash(3): protect in-memory page when using cross-endianness.

Browse Source 
When writing out pages in the "other endian" format, make a copy
instead of trashing the in-memory one.

Obtained from:	NetBSD (CVS rev. 1.29)
This commit is contained in:
Pedro F. Giffuni 2016-09-26 16:06:50 +00:00
parent 7c9a4d09d6
commit 70e7268bd5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=306349
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libc/db/hash/hash_page.c
View File

@ -572,7 +572,9 @@ __get_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_disk,
int
__put_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_bitmap)
{
int fd, page, size, wsize;
int fd, page, size;
ssize_t wsize;
char pbuf[MAX_BSIZE];
size = hashp->BSIZE;
if ((hashp->fp == -1) && open_temp(hashp))
@ -582,15 +584,18 @@ __put_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_bitmap)
if (hashp->LORDER != BYTE_ORDER) {
int i, max;
memcpy(pbuf, p, size);
if (is_bitmap) {
max = hashp->BSIZE >> 2; /* divide by 4 */
for (i = 0; i < max; i++)
M_32_SWAP(((int *)p)[i]);
M_32_SWAP(((int *)pbuf)[i]);
} else {
max = ((u_int16_t *)p)[0] + 2;
uint16_t *bp = (uint16_t *)(void *)pbuf;
max = bp[0] + 2;
for (i = 0; i <= max; i++)
M_16_SWAP(((u_int16_t *)p)[i]);
M_16_SWAP(bp[i]);
}
p = pbuf;
}
if (is_bucket)
page = BUCKET_TO_PAGE(bucket);