Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP3:Update
rpm-ndb.21496
ndb_backport2.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File ndb_backport2.diff of Package rpm-ndb.21496
--- ./lib/backend/ndb/glue.c.orig 2020-04-14 11:13:03.524865184 +0000 +++ ./lib/backend/ndb/glue.c 2020-04-14 11:13:22.868820517 +0000 @@ -143,9 +143,6 @@ static int ndb_Open(rpmdb rdb, rpmDbiTag free(path); dbi->dbi_db = ndbenv->pkgdb = pkgdb; rpmpkgSetFsync(pkgdb, ndbenv->dofsync); - - if ((oflags & (O_RDWR | O_RDONLY)) == O_RDONLY) - dbi->dbi_flags |= DBI_RDONLY; } else { unsigned int id; rpmidxdb idxdb = 0; @@ -184,20 +181,20 @@ static int ndb_Open(rpmdb rdb, rpmDbiTag ndb_CheckIndexSync(ndbenv->pkgdb, ndbenv->xdb); } if (rpmxdbLookupBlob(ndbenv->xdb, &id, rpmtag, 0, 0) == RPMRC_NOTFOUND) { + oflags = O_RDWR|O_CREAT; dbi->dbi_flags |= DBI_CREATED; } rpmlog(RPMLOG_DEBUG, "opening db index %s tag=%d\n", dbiName(dbi), rpmtag); - if (rpmidxOpenXdb(&idxdb, rdb->db_pkgs->dbi_db, ndbenv->xdb, rpmtag)) { + if (rpmidxOpenXdb(&idxdb, rdb->db_pkgs->dbi_db, ndbenv->xdb, rpmtag, oflags)) { perror("rpmidxOpenXdb"); ndb_Close(dbi, 0); return 1; } dbi->dbi_db = idxdb; - - if (rpmxdbIsRdonly(ndbenv->xdb)) - dbi->dbi_flags |= DBI_RDONLY; } + if ((oflags & (O_RDWR | O_RDONLY)) == O_RDONLY) + dbi->dbi_flags |= DBI_RDONLY; if (dbip != NULL) *dbip = dbi; --- ./lib/backend/ndb/rpmidx.c.orig 2020-04-14 11:13:03.528865175 +0000 +++ ./lib/backend/ndb/rpmidx.c 2020-04-14 11:13:22.868820517 +0000 @@ -885,13 +885,17 @@ int rpmidxOpen(rpmidxdb *idxdbp, rpmpkgd return RPMRC_FAIL; } -int rpmidxOpenXdb(rpmidxdb *idxdbp, rpmpkgdb pkgdb, rpmxdb xdb, unsigned int xdbtag) +int rpmidxOpenXdb(rpmidxdb *idxdbp, rpmpkgdb pkgdb, rpmxdb xdb, unsigned int xdbtag, int flags) { rpmidxdb idxdb; unsigned int id; *idxdbp = 0; int rc; + if (rpmxdbIsRdonly(xdb) && (flags & (O_RDONLY|O_RDWR)) != O_RDONLY) { + errno = EACCES; + return RPMRC_FAIL; + } if (rpmxdbLock(xdb, 0)) return RPMRC_FAIL; rc = rpmxdbLookupBlob(xdb, &id, xdbtag, IDXDB_XDB_SUBTAG, 0); @@ -907,7 +911,7 @@ int rpmidxOpenXdb(rpmidxdb *idxdbp, rpmp idxdb->xdbid = id; idxdb->pkgdb = pkgdb; idxdb->pagesize = rpmxdbPagesize(xdb); - idxdb->rdonly = rpmxdbIsRdonly(xdb) ? 1 : 0; + idxdb->rdonly = (flags & (O_RDONLY|O_RDWR)) == O_RDONLY ? 1 : 0; if (!id) { if (rpmidxInit(idxdb)) { free(idxdb); --- ./lib/backend/ndb/rpmidx.h.orig 2017-08-10 08:08:07.114108701 +0000 +++ ./lib/backend/ndb/rpmidx.h 2020-04-14 11:13:22.868820517 +0000 @@ -5,7 +5,7 @@ struct rpmidxdb_s; typedef struct rpmidxdb_s *rpmidxdb; int rpmidxOpen(rpmidxdb *idxdbp, rpmpkgdb pkgdb, const char *filename, int flags, int mode); -int rpmidxOpenXdb(rpmidxdb *idxdbp, rpmpkgdb pkgdb, rpmxdb xdb, unsigned int xdbtag); +int rpmidxOpenXdb(rpmidxdb *idxdbp, rpmpkgdb pkgdb, rpmxdb xdb, unsigned int xdbtag, int flags); int rpmidxDelXdb(rpmpkgdb pkgdb, rpmxdb xdb, unsigned int xdbtag); void rpmidxClose(rpmidxdb idxdbp); --- ./lib/backend/ndb/rpmxdb.c.orig 2020-04-14 11:13:03.528865175 +0000 +++ ./lib/backend/ndb/rpmxdb.c 2020-04-14 11:13:22.868820517 +0000 @@ -36,7 +36,7 @@ typedef struct rpmxdb_s { unsigned int usergeneration; unsigned char *mapped; - int mapflags; + int mappedrw; unsigned int mappedlen; struct xdb_slot { @@ -57,6 +57,7 @@ typedef struct rpmxdb_s { unsigned int usedblobpages; unsigned int systempagesize; int dofsync; + unsigned int locked_excl; } *rpmxdb; @@ -125,17 +126,19 @@ static void unmapmem(void *addr, size_t #define ROUNDTOSYSTEMPAGE(xdb, size) (((size) + (xdb->systempagesize - 1)) & ~(xdb->systempagesize - 1)) /* xdb header mapping functions */ -static int mapheader(rpmxdb xdb, unsigned int slotnpages) +static int mapheader(rpmxdb xdb, unsigned int slotnpages, int rw) { unsigned char *mapped; size_t mappedlen = slotnpages * xdb->pagesize; + int mapflags = rw ? PROT_READ | PROT_WRITE : PROT_READ; mappedlen = ROUNDTOSYSTEMPAGE(xdb, mappedlen); - mapped = mapmem(xdb->mapped, xdb->mappedlen, mappedlen, xdb->mapflags, xdb->fd, 0); + mapped = mapmem(xdb->mapped, xdb->mappedlen, mappedlen, mapflags, xdb->fd, 0); if ((void *)mapped == MAP_FAILED) return RPMRC_FAIL; xdb->mapped = mapped; xdb->mappedlen = mappedlen; + xdb->mappedrw = rw; return RPMRC_OK; } @@ -247,7 +250,7 @@ static int rpmxdbReadHeaderRaw(rpmxdb xd return RPMRC_OK; } -static int rpmxdbReadHeader(rpmxdb xdb) +static int rpmxdbReadHeader(rpmxdb xdb, int rw) { struct xdb_slot *slot; unsigned int slotnpages, pagesize, generation, usergeneration; @@ -261,6 +264,11 @@ static int rpmxdbReadHeader(rpmxdb xdb) if (xdb->mapped) { if (le2ha(xdb->mapped + XDB_OFFSET_GENERATION) == xdb->generation) { + if (rw && !xdb->mappedrw) { + unmapheader(xdb); + if (mapheader(xdb, xdb->slotnpages, rw)) + return RPMRC_FAIL; + } return RPMRC_OK; } unmapheader(xdb); @@ -273,9 +281,8 @@ static int rpmxdbReadHeader(rpmxdb xdb) if (stb.st_size % pagesize != 0) return RPMRC_FAIL; xdb->pagesize = pagesize; - xdb->mapflags = xdb->rdonly ? PROT_READ : PROT_READ | PROT_WRITE; - if (mapheader(xdb, slotnpages)) + if (mapheader(xdb, slotnpages, rw)) return RPMRC_FAIL; /* read in all slots */ @@ -368,6 +375,8 @@ static int rpmxdbReadHeader(rpmxdb xdb) nslot->mapcallback(xdb, nslot->mapcallbackdata, 0, 0); } } + } else { + nslot->mapped = slot->mapped; } } } @@ -382,17 +391,14 @@ static int rpmxdbReadHeader(rpmxdb xdb) return RPMRC_OK; } -static int rpmxdbWriteHeader(rpmxdb xdb) +static void rpmxdbWriteHeader(rpmxdb xdb) { - if (!xdb->mapped) - return RPMRC_FAIL; h2lea(XDB_MAGIC, xdb->mapped + XDB_OFFSET_MAGIC); h2lea(XDB_VERSION, xdb->mapped + XDB_OFFSET_VERSION); h2lea(xdb->generation, xdb->mapped + XDB_OFFSET_GENERATION); h2lea(xdb->slotnpages, xdb->mapped + XDB_OFFSET_SLOTNPAGES); h2lea(xdb->pagesize, xdb->mapped + XDB_OFFSET_PAGESIZE); h2lea(xdb->usergeneration, xdb->mapped + XDB_OFFSET_USERGENERATION); - return RPMRC_OK; } static void rpmxdbUpdateSlot(rpmxdb xdb, struct xdb_slot *slot) @@ -473,19 +479,25 @@ static int rpmxdbInitInternal(rpmxdb xdb /* we use the master pdb for locking */ static int rpmxdbLockOnly(rpmxdb xdb, int excl) { + int rc; if (excl && xdb->rdonly) return RPMRC_FAIL; - return rpmpkgLock(xdb->pkgdb, excl); + rc = rpmpkgLock(xdb->pkgdb, excl); + if (!rc && excl) + xdb->locked_excl++; + return rc; } -/* this is the same as rpmxdbLockReadHeader. It does the +/* This is similar to rpmxdbLockReadHeader. It does the * ReadHeader to sync the mappings if xdb moved some blobs. + * Note that we just ask for rad-only access in the + * rpmxdbReadHeader call. */ int rpmxdbLock(rpmxdb xdb, int excl) { if (rpmxdbLockOnly(xdb, excl)) return RPMRC_FAIL; - if (rpmxdbReadHeader(xdb)) { + if (rpmxdbReadHeader(xdb, 0)) { rpmxdbUnlock(xdb, excl); return RPMRC_FAIL; } @@ -494,14 +506,25 @@ int rpmxdbLock(rpmxdb xdb, int excl) int rpmxdbUnlock(rpmxdb xdb, int excl) { + if (excl && xdb->locked_excl) { + xdb->locked_excl--; + if (!xdb->locked_excl && xdb->mapped && xdb->mappedrw) { + unmapheader(xdb); + mapheader(xdb, xdb->slotnpages, 0); + } + } return rpmpkgUnlock(xdb->pkgdb, excl); } +/* Like rpmxdbLock, but map the header rw if excl is set. + * This is what the functions in this module use, whereas + * rpmidx uses rpmxdbLock. + */ static int rpmxdbLockReadHeader(rpmxdb xdb, int excl) { if (rpmxdbLockOnly(xdb, excl)) return RPMRC_FAIL; - if (rpmxdbReadHeader(xdb)) { + if (rpmxdbReadHeader(xdb, excl)) { rpmxdbUnlock(xdb, excl); return RPMRC_FAIL; } @@ -594,6 +617,8 @@ void rpmxdbClose(rpmxdb xdb) } if (xdb->slots) free(xdb->slots); + if (xdb->mapped) + unmapheader(xdb); if (xdb->fd >= 0) close(xdb->fd); if (xdb->filename) @@ -623,7 +648,8 @@ static int moveblobto(rpmxdb xdb, struct didmap = 0; oldpagecnt = oldslot->pagecnt; if (!oldslot->mapped && oldpagecnt) { - oldslot->mapflags = PROT_READ; + if (!oldslot->mapcallback) + oldslot->mapflags = PROT_READ; if (mapslot(xdb, oldslot)) return RPMRC_FAIL; didmap = 1; @@ -772,7 +798,7 @@ static int addslotpage(rpmxdb xdb) return RPMRC_FAIL; /* remap the header */ - if (mapheader(xdb, xdb->slotnpages + 1)) + if (mapheader(xdb, xdb->slotnpages + 1, xdb->mappedrw)) return RPMRC_FAIL; /* update the header */ @@ -852,7 +878,8 @@ int rpmxdbLookupBlob(rpmxdb xdb, unsigne { struct xdb_slot *slot; unsigned int i, nslots; - if (rpmxdbLockReadHeader(xdb, flags ? 1 : 0)) + int excl = flags ? 1 : 0; + if (rpmxdbLockReadHeader(xdb, excl)) return RPMRC_FAIL; nslots = xdb->nslots; slot = 0; @@ -865,18 +892,18 @@ int rpmxdbLookupBlob(rpmxdb xdb, unsigne i = 0; if (i && (flags & O_TRUNC) != 0) { if (rpmxdbResizeBlob(xdb, i, 0)) { - rpmxdbUnlock(xdb, flags ? 1 : 0); + rpmxdbUnlock(xdb, excl); return RPMRC_FAIL; } } if (!i && (flags & O_CREAT) != 0) { if (createblob(xdb, &i, blobtag, subtag)) { - rpmxdbUnlock(xdb, flags ? 1 : 0); + rpmxdbUnlock(xdb, excl); return RPMRC_FAIL; } } *idp = i; - rpmxdbUnlock(xdb, flags ? 1 : 0); + rpmxdbUnlock(xdb, excl); return i ? RPMRC_OK : RPMRC_NOTFOUND; } --- ./lib/rpmdb.c.orig 2020-04-14 11:13:03.480865285 +0000 +++ ./lib/rpmdb.c 2020-04-14 11:13:22.868820517 +0000 @@ -2583,6 +2583,7 @@ int rpmdbRebuild(const char * prefix, rp } rpmdbClose(olddb); + dbCtrl(newdb, DB_CTRL_INDEXSYNC); rpmdbClose(newdb); if (failed) {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
