diff --git a/NEWS b/NEWS index 803afd4..748c643 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,32 @@ User-Visible OpenAFS Changes +OpenAFS 1.6.17 (Security Release) + + All server platforms + + * Fix for OPENAFS-SA-2016-001: foreign users can create groups as + if they were an administrator (RT #132822) (CVE-2016-2860) + + All client platforms + + * Fix for OPENAFS-SA-2016-002: information leakage from sending + uninitialized memory over the network. Multiple call sites + were vulnerable, with potential for leaking both kernel and + userland stack data (RT #132847) + + * Update to the GCO CellServDB update from 01 January 2016 (12188) + + Linux clients + + * Fix a crash when the root volume is not found and dynroot is not + in use, a regression introduced in 1.6.14.1 (12166) + + * Avoid introducing a dependency on the kernel-devel package corresponding + to the currently running system while building the srpm (12195) + + * Create systemd unit files with mode 0644 instead of 0755 + (12196) (RT #132662) + OpenAFS 1.6.16 All platforms diff --git a/configure-libafs.ac b/configure-libafs.ac index 65a6a0b..d2aaa71 100644 --- a/configure-libafs.ac +++ b/configure-libafs.ac @@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR(src/libafs/Makefile.common.in) AM_INIT_AUTOMAKE AC_CONFIG_HEADER(src/config/afsconfig.h) -MACOS_VERSION=1.6.16 +MACOS_VERSION=1.6.17 AC_SUBST(MACOS_VERSION) diff --git a/configure.ac b/configure.ac index 90c75a3..37d9ac5 100644 --- a/configure.ac +++ b/configure.ac @@ -5,8 +5,8 @@ AC_CONFIG_SRCDIR([src/config/stds.h]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER(src/config/afsconfig.h) -MACOS_VERSION=1.6.16 -LINUX_PKGVER=1.6.16 +MACOS_VERSION=1.6.17 +LINUX_PKGVER=1.6.17 dnl Debian wants the release candidate version in the main upstream version, dnl and wants ~ before it. diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index 031ce29..b65fe1c 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -416,6 +416,7 @@ long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) int call_was_64bit = 0; memset(&volSync, 0, sizeof(volSync)); + memset(&inStatus, 0, sizeof(inStatus); osi_Log2(afsd_logp, "cm_StoreMini scp 0x%p userp 0x%p", scp, userp); diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c index db32eec..172cbc0 100644 --- a/src/WINNT/afsd/cm_ioctl.c +++ b/src/WINNT/afsd/cm_ioctl.c @@ -632,6 +632,7 @@ cm_IoctlSetVolumeStatus(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scach clientchar_t *strp; struct rx_connection * rxconnp; + memset(&storeStat, 0, sizeof(storeStat)); #ifdef AFS_FREELANCE_CLIENT if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) { code = CM_ERROR_NOACCESS; diff --git a/src/WINNT/install/NSIS/CellServDB b/src/WINNT/install/NSIS/CellServDB index 4bcf3ee..e0fc656 100644 --- a/src/WINNT/install/NSIS/CellServDB +++ b/src/WINNT/install/NSIS/CellServDB @@ -1,4 +1,4 @@ ->grand.central.org #GCO Public CellServDB 19 Jan 2015 +>grand.central.org #GCO Public CellServDB 01 Jan 2016 18.9.48.14 #grand.mit.edu 128.2.13.219 #grand-old-opry.central.org >wu-wien.ac.at #University of Economics, Vienna, Austria @@ -6,9 +6,9 @@ 137.208.7.57 #caravaggio.wu-wien.ac.at 137.208.8.14 #vermeer.wu-wien.ac.at >hephy.at #hephy-vienna -193.170.243.10 #mowgli.oeaw.ac.at -193.170.243.12 #baloo.oeaw.ac.at -193.170.243.14 #akela.oeaw.ac.at +193.170.243.10 #afs01.hephy.oeaw.ac.at +193.170.243.12 #afs02.hephy.oeaw.ac.at +193.170.243.14 #afs03.hephy.oeaw.ac.at >cgv.tugraz.at #CGV cell 129.27.218.30 #phobos.cgv.tugraz.at 129.27.218.31 #deimos.cgv.tugraz.at @@ -57,10 +57,10 @@ 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz ->ics.muni.cz #Masaryk university +>ics.muni.cz #Masaryk university, Czech Republic 147.251.3.11 #grond.ics.muni.cz -147.251.3.15 #nimloth.ics.muni.cz -147.251.3.19 #sirion.ics.muni.cz +147.251.9.9 #smaug2.ics.muni.cz +195.113.214.4 #tarkil-xen.cesnet.cz >zcu.cz #University of West Bohemia, Czech Republic 147.228.10.18 #sauron.zcu.cz 147.228.52.10 #oknos.zcu.cz @@ -141,6 +141,9 @@ 134.100.106.44 #afs-core.physnet.uni-hamburg.de 134.100.106.45 #afs-core2.physnet.uni-hamburg.de 134.100.106.47 #afs-core3.physnet.uni-hamburg.de +>iqo.uni-hannover.de #Institut fuer Quantenoptik Hannover +130.75.103.221 #afs1.iqo.uni-hannover.de +130.75.103.223 #afs2.iqo.uni-hannover.de >mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut) 129.206.26.241 #hactar.mathi.uni-heidelberg.de >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) @@ -177,10 +180,15 @@ 134.155.97.204 #afsdb1.uni-mannheim.de 134.155.97.205 #afsdb2.uni-mannheim.de 134.155.97.206 #afsdb3.uni-mannheim.de ->uni-paderborn.de #University of Paderborn, Germany -131.234.137.10 #afsdb1.uni-paderborn.de -131.234.137.11 #afsdb2.uni-paderborn.de -131.234.137.12 #afsdb3.uni-paderborn.de +>mathematik.uni-stuttgart.de #University of Stuttgart, Math Dept. +129.69.61.1 #fbm01.mathematik.uni-stuttgart.de +129.69.61.2 #fbm02.mathematik.uni-stuttgart.de +129.69.61.3 #fbm03.mathematik.uni-stuttgart.de +>stud.mathematik.uni-stuttgart.de #CIP-Pool of Math. Dept, University of Stuttgart +129.69.61.28 #omni.mathematik.uni-stuttgart.de +129.69.116.201 #stud01.mathematik.uni-stuttgart.de +129.69.116.202 #stud02.mathematik.uni-stuttgart.de +129.69.116.203 #stud03.mathematik.uni-stuttgart.de >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal 132.195.104.3 #afs1.physik.uni-wuppertal.de 132.195.104.230 #afs2.physik.uni-wuppertal.de @@ -375,6 +383,7 @@ 155.98.111.10 #carl.eng.utah.edu >cs.uwm.edu #University of Wisconsin--Milwaukee 129.89.38.124 #solomons.cs.uwm.edu +129.89.143.71 #filip.cs.uwm.edu >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. 128.105.132.14 #timon.cs.wisc.edu 128.105.132.15 #pumbaa.cs.wisc.edu @@ -524,9 +533,9 @@ >laroia.net #Laroia Networks 66.66.102.254 #supercore.laroia.net >sinenomine.net #Sine Nomine Associates -72.73.25.18 #afsdb2.sinenomine.net -72.73.30.74 #afsdb3.sinenomine.net 199.167.73.142 #afsdb1.sinenomine.net +199.167.73.152 #afsdb4.sinenomine.net +199.167.73.153 #afsdb5.sinenomine.net >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames @@ -595,9 +604,7 @@ 130.237.216.15 #afsdb2.it.kth.se 130.237.216.16 #afsdb3.it.kth.se >md.kth.se #Royal Institute of Technology, MMK -130.237.57.21 #euler.md.kth.se -130.237.57.68 #trinity.md.kth.se -130.237.57.72 #morpheus.md.kth.se +130.237.57.7 #mdafs-1.md.kth.se >mech.kth.se #Royal Institute of Technology, MECH 130.237.233.142 #matterhorn.mech.kth.se 130.237.233.143 #castor.mech.kth.se diff --git a/src/WINNT/install/wix/CellServDB b/src/WINNT/install/wix/CellServDB index 4bcf3ee..e0fc656 100644 --- a/src/WINNT/install/wix/CellServDB +++ b/src/WINNT/install/wix/CellServDB @@ -1,4 +1,4 @@ ->grand.central.org #GCO Public CellServDB 19 Jan 2015 +>grand.central.org #GCO Public CellServDB 01 Jan 2016 18.9.48.14 #grand.mit.edu 128.2.13.219 #grand-old-opry.central.org >wu-wien.ac.at #University of Economics, Vienna, Austria @@ -6,9 +6,9 @@ 137.208.7.57 #caravaggio.wu-wien.ac.at 137.208.8.14 #vermeer.wu-wien.ac.at >hephy.at #hephy-vienna -193.170.243.10 #mowgli.oeaw.ac.at -193.170.243.12 #baloo.oeaw.ac.at -193.170.243.14 #akela.oeaw.ac.at +193.170.243.10 #afs01.hephy.oeaw.ac.at +193.170.243.12 #afs02.hephy.oeaw.ac.at +193.170.243.14 #afs03.hephy.oeaw.ac.at >cgv.tugraz.at #CGV cell 129.27.218.30 #phobos.cgv.tugraz.at 129.27.218.31 #deimos.cgv.tugraz.at @@ -57,10 +57,10 @@ 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz ->ics.muni.cz #Masaryk university +>ics.muni.cz #Masaryk university, Czech Republic 147.251.3.11 #grond.ics.muni.cz -147.251.3.15 #nimloth.ics.muni.cz -147.251.3.19 #sirion.ics.muni.cz +147.251.9.9 #smaug2.ics.muni.cz +195.113.214.4 #tarkil-xen.cesnet.cz >zcu.cz #University of West Bohemia, Czech Republic 147.228.10.18 #sauron.zcu.cz 147.228.52.10 #oknos.zcu.cz @@ -141,6 +141,9 @@ 134.100.106.44 #afs-core.physnet.uni-hamburg.de 134.100.106.45 #afs-core2.physnet.uni-hamburg.de 134.100.106.47 #afs-core3.physnet.uni-hamburg.de +>iqo.uni-hannover.de #Institut fuer Quantenoptik Hannover +130.75.103.221 #afs1.iqo.uni-hannover.de +130.75.103.223 #afs2.iqo.uni-hannover.de >mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut) 129.206.26.241 #hactar.mathi.uni-heidelberg.de >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) @@ -177,10 +180,15 @@ 134.155.97.204 #afsdb1.uni-mannheim.de 134.155.97.205 #afsdb2.uni-mannheim.de 134.155.97.206 #afsdb3.uni-mannheim.de ->uni-paderborn.de #University of Paderborn, Germany -131.234.137.10 #afsdb1.uni-paderborn.de -131.234.137.11 #afsdb2.uni-paderborn.de -131.234.137.12 #afsdb3.uni-paderborn.de +>mathematik.uni-stuttgart.de #University of Stuttgart, Math Dept. +129.69.61.1 #fbm01.mathematik.uni-stuttgart.de +129.69.61.2 #fbm02.mathematik.uni-stuttgart.de +129.69.61.3 #fbm03.mathematik.uni-stuttgart.de +>stud.mathematik.uni-stuttgart.de #CIP-Pool of Math. Dept, University of Stuttgart +129.69.61.28 #omni.mathematik.uni-stuttgart.de +129.69.116.201 #stud01.mathematik.uni-stuttgart.de +129.69.116.202 #stud02.mathematik.uni-stuttgart.de +129.69.116.203 #stud03.mathematik.uni-stuttgart.de >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal 132.195.104.3 #afs1.physik.uni-wuppertal.de 132.195.104.230 #afs2.physik.uni-wuppertal.de @@ -375,6 +383,7 @@ 155.98.111.10 #carl.eng.utah.edu >cs.uwm.edu #University of Wisconsin--Milwaukee 129.89.38.124 #solomons.cs.uwm.edu +129.89.143.71 #filip.cs.uwm.edu >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. 128.105.132.14 #timon.cs.wisc.edu 128.105.132.15 #pumbaa.cs.wisc.edu @@ -524,9 +533,9 @@ >laroia.net #Laroia Networks 66.66.102.254 #supercore.laroia.net >sinenomine.net #Sine Nomine Associates -72.73.25.18 #afsdb2.sinenomine.net -72.73.30.74 #afsdb3.sinenomine.net 199.167.73.142 #afsdb1.sinenomine.net +199.167.73.152 #afsdb4.sinenomine.net +199.167.73.153 #afsdb5.sinenomine.net >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames @@ -595,9 +604,7 @@ 130.237.216.15 #afsdb2.it.kth.se 130.237.216.16 #afsdb3.it.kth.se >md.kth.se #Royal Institute of Technology, MMK -130.237.57.21 #euler.md.kth.se -130.237.57.68 #trinity.md.kth.se -130.237.57.72 #morpheus.md.kth.se +130.237.57.7 #mdafs-1.md.kth.se >mech.kth.se #Royal Institute of Technology, MECH 130.237.233.142 #matterhorn.mech.kth.se 130.237.233.143 #castor.mech.kth.se diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index 934478d..3936d4d 100644 --- a/src/afs/LINUX/osi_vfsops.c +++ b/src/afs/LINUX/osi_vfsops.c @@ -150,7 +150,7 @@ afs_fill_super(struct super_block *sb, void *data, int silent) #if defined(HAVE_LINUX_BDI_INIT) bdi_destroy(afs_backing_dev_info); #endif - osi_Free(afs_backing_dev_info, sizeof(struct backing_dev_info)); + kfree(afs_backing_dev_info); module_put(THIS_MODULE); } diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index 2eb228f..2633db3 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -360,6 +360,7 @@ afs_VAttrToAS(struct vcache *avc, struct vattr *av, { int mask; mask = 0; + AFS_STATCNT(afs_VAttrToAS); #if defined(AFS_DARWIN80_ENV) if (VATTR_IS_ACTIVE(av, va_mode)) { @@ -485,6 +486,8 @@ afs_setattr(OSI_VC_DECL(avc), struct vattr *attrs, if ((code = afs_CreateReq(&treq, acred))) return code; + memset(&astat, 0, sizeof(astat)); + AFS_DISCON_LOCK(); afs_InitFakeStat(&fakestate); diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c index fc87018..f33da96 100644 --- a/src/afs/VNOPS/afs_vnop_create.c +++ b/src/afs/VNOPS/afs_vnop_create.c @@ -64,6 +64,7 @@ afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + memset(&InStatus, 0, sizeof(InStatus)); if ((code = afs_CreateReq(&treq, acred))) goto done2; diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c index 8b49a68..33455cb 100644 --- a/src/afs/VNOPS/afs_vnop_dirops.c +++ b/src/afs/VNOPS/afs_vnop_dirops.c @@ -61,6 +61,7 @@ afs_mkdir(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + memset(&InStatus, 0, sizeof(InStatus)); if ((code = afs_CreateReq(&treq, acred))) goto done2; diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c index 993d5ac..bd22639 100644 --- a/src/afs/VNOPS/afs_vnop_symlink.c +++ b/src/afs/VNOPS/afs_vnop_symlink.c @@ -94,6 +94,7 @@ afs_symlink(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + memset(&InStatus, 0, sizeof(InStatus)); if ((code = afs_CreateReq(&treq, acred))) goto done2; diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c index 04107f0..cfd5d63 100644 --- a/src/afs/afs_disconnected.c +++ b/src/afs/afs_disconnected.c @@ -671,6 +671,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq, tname = afs_osi_Alloc(AFSNAMEMAX); if (!tname) return ENOMEM; + memset(&InStatus, 0, sizeof(InStatus)); code = afs_GetParentVCache(avc, 0, &pdir_fid, tname, &tdp); if (code) diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 0c96172..19a4865 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -2051,6 +2051,7 @@ DECL_PIOCTL(PSetVolumeStatus) AFS_STATCNT(PSetVolumeStatus); if (!avc) return EINVAL; + memset(&storeStat, 0, sizeof(storeStat)); tvp = afs_GetVolume(&avc->f.fid, areq, READ_LOCK); if (tvp) { diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c index 1ea3311..2dd89cf 100644 --- a/src/afs/afs_segments.c +++ b/src/afs/afs_segments.c @@ -55,6 +55,7 @@ afs_StoreMini(struct vcache *avc, struct vrequest *areq) tlen = avc->f.truncPos; avc->f.truncPos = AFS_NOTRUNC; avc->f.states &= ~CExtendedFile; + memset(&InStatus, 0, sizeof(InStatus)); do { tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK, &rxconn); diff --git a/src/afsd/CellServDB b/src/afsd/CellServDB index 4bcf3ee..e0fc656 100644 --- a/src/afsd/CellServDB +++ b/src/afsd/CellServDB @@ -1,4 +1,4 @@ ->grand.central.org #GCO Public CellServDB 19 Jan 2015 +>grand.central.org #GCO Public CellServDB 01 Jan 2016 18.9.48.14 #grand.mit.edu 128.2.13.219 #grand-old-opry.central.org >wu-wien.ac.at #University of Economics, Vienna, Austria @@ -6,9 +6,9 @@ 137.208.7.57 #caravaggio.wu-wien.ac.at 137.208.8.14 #vermeer.wu-wien.ac.at >hephy.at #hephy-vienna -193.170.243.10 #mowgli.oeaw.ac.at -193.170.243.12 #baloo.oeaw.ac.at -193.170.243.14 #akela.oeaw.ac.at +193.170.243.10 #afs01.hephy.oeaw.ac.at +193.170.243.12 #afs02.hephy.oeaw.ac.at +193.170.243.14 #afs03.hephy.oeaw.ac.at >cgv.tugraz.at #CGV cell 129.27.218.30 #phobos.cgv.tugraz.at 129.27.218.31 #deimos.cgv.tugraz.at @@ -57,10 +57,10 @@ 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz ->ics.muni.cz #Masaryk university +>ics.muni.cz #Masaryk university, Czech Republic 147.251.3.11 #grond.ics.muni.cz -147.251.3.15 #nimloth.ics.muni.cz -147.251.3.19 #sirion.ics.muni.cz +147.251.9.9 #smaug2.ics.muni.cz +195.113.214.4 #tarkil-xen.cesnet.cz >zcu.cz #University of West Bohemia, Czech Republic 147.228.10.18 #sauron.zcu.cz 147.228.52.10 #oknos.zcu.cz @@ -141,6 +141,9 @@ 134.100.106.44 #afs-core.physnet.uni-hamburg.de 134.100.106.45 #afs-core2.physnet.uni-hamburg.de 134.100.106.47 #afs-core3.physnet.uni-hamburg.de +>iqo.uni-hannover.de #Institut fuer Quantenoptik Hannover +130.75.103.221 #afs1.iqo.uni-hannover.de +130.75.103.223 #afs2.iqo.uni-hannover.de >mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut) 129.206.26.241 #hactar.mathi.uni-heidelberg.de >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) @@ -177,10 +180,15 @@ 134.155.97.204 #afsdb1.uni-mannheim.de 134.155.97.205 #afsdb2.uni-mannheim.de 134.155.97.206 #afsdb3.uni-mannheim.de ->uni-paderborn.de #University of Paderborn, Germany -131.234.137.10 #afsdb1.uni-paderborn.de -131.234.137.11 #afsdb2.uni-paderborn.de -131.234.137.12 #afsdb3.uni-paderborn.de +>mathematik.uni-stuttgart.de #University of Stuttgart, Math Dept. +129.69.61.1 #fbm01.mathematik.uni-stuttgart.de +129.69.61.2 #fbm02.mathematik.uni-stuttgart.de +129.69.61.3 #fbm03.mathematik.uni-stuttgart.de +>stud.mathematik.uni-stuttgart.de #CIP-Pool of Math. Dept, University of Stuttgart +129.69.61.28 #omni.mathematik.uni-stuttgart.de +129.69.116.201 #stud01.mathematik.uni-stuttgart.de +129.69.116.202 #stud02.mathematik.uni-stuttgart.de +129.69.116.203 #stud03.mathematik.uni-stuttgart.de >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal 132.195.104.3 #afs1.physik.uni-wuppertal.de 132.195.104.230 #afs2.physik.uni-wuppertal.de @@ -375,6 +383,7 @@ 155.98.111.10 #carl.eng.utah.edu >cs.uwm.edu #University of Wisconsin--Milwaukee 129.89.38.124 #solomons.cs.uwm.edu +129.89.143.71 #filip.cs.uwm.edu >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. 128.105.132.14 #timon.cs.wisc.edu 128.105.132.15 #pumbaa.cs.wisc.edu @@ -524,9 +533,9 @@ >laroia.net #Laroia Networks 66.66.102.254 #supercore.laroia.net >sinenomine.net #Sine Nomine Associates -72.73.25.18 #afsdb2.sinenomine.net -72.73.30.74 #afsdb3.sinenomine.net 199.167.73.142 #afsdb1.sinenomine.net +199.167.73.152 #afsdb4.sinenomine.net +199.167.73.153 #afsdb5.sinenomine.net >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames @@ -595,9 +604,7 @@ 130.237.216.15 #afsdb2.it.kth.se 130.237.216.16 #afsdb3.it.kth.se >md.kth.se #Royal Institute of Technology, MMK -130.237.57.21 #euler.md.kth.se -130.237.57.68 #trinity.md.kth.se -130.237.57.72 #morpheus.md.kth.se +130.237.57.7 #mdafs-1.md.kth.se >mech.kth.se #Royal Institute of Technology, MECH 130.237.233.142 #matterhorn.mech.kth.se 130.237.233.143 #castor.mech.kth.se diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c index d93dc2a..dbf07f4 100644 --- a/src/afsd/afsd_kernel.c +++ b/src/afsd/afsd_kernel.c @@ -510,8 +510,8 @@ afsd_mount_afs(const char *rn, const char *cacheMountDir) printf("%s: Mounting the AFS root on '%s', flags: %d.\n", rn, cacheMountDir, mountFlags); #if defined(AFS_FBSD60_ENV) - /* data must be non-NULL but is otherwise ignored */ - if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, rn)) < 0) { + /* data must be non-const non-NULL but is otherwise ignored */ + if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, &mountFlags)) < 0) { #elif defined(AFS_FBSD_ENV) if ((mount("AFS", cacheMountDir, mountFlags, (caddr_t) 0)) < 0) { #elif defined(AFS_AIX_ENV) diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index a1c1385..531c3c5 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -219,6 +219,7 @@ EvalVolumeSet2(struct bc_config *aconfig, *avols = (struct bc_volumeDump *)0; bulkentries.nbulkentries_len = 0; bulkentries.nbulkentries_val = 0; + memset(&attributes, 0, sizeof(attributes)); /* For each of the volume set entries - collect the volumes that match it */ for (tve = avs->ventries; tve; tve = tve->next) { diff --git a/src/comerr/error_table.y b/src/comerr/error_table.y index 62331c2..97bd9ab 100644 --- a/src/comerr/error_table.y +++ b/src/comerr/error_table.y @@ -20,7 +20,6 @@ #else #include #endif -#include #include "error_table.h" #include "mit-sipb-cr.h" diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 184ca65..a2831a4 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -90,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=6 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=1601 +AFSPRODUCT_VER_PATCH=1700 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 4e7f020..552768d 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -90,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=6 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=1601 +AFSPRODUCT_VER_PATCH=1700 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 1a7040c..58c81b6 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -94,7 +94,7 @@ AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=6 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=1601 +AFSPRODUCT_VER_PATCH=1700 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c index bed8c49..557feb9 100644 --- a/src/libadmin/vos/afs_vosAdmin.c +++ b/src/libadmin/vos/afs_vosAdmin.c @@ -1199,6 +1199,7 @@ GetServerRPC(void *rpc_specific, int slot, int *last_item, bulkaddrs addr_multi; int i; + memset(&m_attrs, 0, sizeof(m_attrs)); /* * Check to see if this is a multihomed address server */ diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c index 060cbf2..2fb11de 100644 --- a/src/libadmin/vos/vsprocs.c +++ b/src/libadmin/vos/vsprocs.c @@ -3621,6 +3621,7 @@ UV_SyncServer(afs_cell_handle_p cellHandle, struct rx_connection *server, noError = 1; arrayEntries.nbulkentries_val = 0; + memset(&attributes, 0, sizeof(attributes)); /* Set up attributes to search VLDB */ attributes.server = ntohl(rx_HostOf(rx_PeerOf(server))); diff --git a/src/libafscp/afscp_file.c b/src/libafscp/afscp_file.c index c71f601..a3985e3 100644 --- a/src/libafscp/afscp_file.c +++ b/src/libafscp/afscp_file.c @@ -124,6 +124,7 @@ afscp_PWrite(const struct afscp_venusfid * fid, const void *buffer, off_t filesize; time_t now; + memset(&sst, 0, sizeof(sst)); vol = afscp_VolumeById(fid->cell, fid->fid.Volume); if (vol == NULL) { afscp_errno = ENOENT; diff --git a/src/packaging/Debian/CellServDB b/src/packaging/Debian/CellServDB index 4bcf3ee..e0fc656 100644 --- a/src/packaging/Debian/CellServDB +++ b/src/packaging/Debian/CellServDB @@ -1,4 +1,4 @@ ->grand.central.org #GCO Public CellServDB 19 Jan 2015 +>grand.central.org #GCO Public CellServDB 01 Jan 2016 18.9.48.14 #grand.mit.edu 128.2.13.219 #grand-old-opry.central.org >wu-wien.ac.at #University of Economics, Vienna, Austria @@ -6,9 +6,9 @@ 137.208.7.57 #caravaggio.wu-wien.ac.at 137.208.8.14 #vermeer.wu-wien.ac.at >hephy.at #hephy-vienna -193.170.243.10 #mowgli.oeaw.ac.at -193.170.243.12 #baloo.oeaw.ac.at -193.170.243.14 #akela.oeaw.ac.at +193.170.243.10 #afs01.hephy.oeaw.ac.at +193.170.243.12 #afs02.hephy.oeaw.ac.at +193.170.243.14 #afs03.hephy.oeaw.ac.at >cgv.tugraz.at #CGV cell 129.27.218.30 #phobos.cgv.tugraz.at 129.27.218.31 #deimos.cgv.tugraz.at @@ -57,10 +57,10 @@ 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz ->ics.muni.cz #Masaryk university +>ics.muni.cz #Masaryk university, Czech Republic 147.251.3.11 #grond.ics.muni.cz -147.251.3.15 #nimloth.ics.muni.cz -147.251.3.19 #sirion.ics.muni.cz +147.251.9.9 #smaug2.ics.muni.cz +195.113.214.4 #tarkil-xen.cesnet.cz >zcu.cz #University of West Bohemia, Czech Republic 147.228.10.18 #sauron.zcu.cz 147.228.52.10 #oknos.zcu.cz @@ -141,6 +141,9 @@ 134.100.106.44 #afs-core.physnet.uni-hamburg.de 134.100.106.45 #afs-core2.physnet.uni-hamburg.de 134.100.106.47 #afs-core3.physnet.uni-hamburg.de +>iqo.uni-hannover.de #Institut fuer Quantenoptik Hannover +130.75.103.221 #afs1.iqo.uni-hannover.de +130.75.103.223 #afs2.iqo.uni-hannover.de >mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut) 129.206.26.241 #hactar.mathi.uni-heidelberg.de >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) @@ -177,10 +180,15 @@ 134.155.97.204 #afsdb1.uni-mannheim.de 134.155.97.205 #afsdb2.uni-mannheim.de 134.155.97.206 #afsdb3.uni-mannheim.de ->uni-paderborn.de #University of Paderborn, Germany -131.234.137.10 #afsdb1.uni-paderborn.de -131.234.137.11 #afsdb2.uni-paderborn.de -131.234.137.12 #afsdb3.uni-paderborn.de +>mathematik.uni-stuttgart.de #University of Stuttgart, Math Dept. +129.69.61.1 #fbm01.mathematik.uni-stuttgart.de +129.69.61.2 #fbm02.mathematik.uni-stuttgart.de +129.69.61.3 #fbm03.mathematik.uni-stuttgart.de +>stud.mathematik.uni-stuttgart.de #CIP-Pool of Math. Dept, University of Stuttgart +129.69.61.28 #omni.mathematik.uni-stuttgart.de +129.69.116.201 #stud01.mathematik.uni-stuttgart.de +129.69.116.202 #stud02.mathematik.uni-stuttgart.de +129.69.116.203 #stud03.mathematik.uni-stuttgart.de >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal 132.195.104.3 #afs1.physik.uni-wuppertal.de 132.195.104.230 #afs2.physik.uni-wuppertal.de @@ -375,6 +383,7 @@ 155.98.111.10 #carl.eng.utah.edu >cs.uwm.edu #University of Wisconsin--Milwaukee 129.89.38.124 #solomons.cs.uwm.edu +129.89.143.71 #filip.cs.uwm.edu >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. 128.105.132.14 #timon.cs.wisc.edu 128.105.132.15 #pumbaa.cs.wisc.edu @@ -524,9 +533,9 @@ >laroia.net #Laroia Networks 66.66.102.254 #supercore.laroia.net >sinenomine.net #Sine Nomine Associates -72.73.25.18 #afsdb2.sinenomine.net -72.73.30.74 #afsdb3.sinenomine.net 199.167.73.142 #afsdb1.sinenomine.net +199.167.73.152 #afsdb4.sinenomine.net +199.167.73.153 #afsdb5.sinenomine.net >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames @@ -595,9 +604,7 @@ 130.237.216.15 #afsdb2.it.kth.se 130.237.216.16 #afsdb3.it.kth.se >md.kth.se #Royal Institute of Technology, MMK -130.237.57.21 #euler.md.kth.se -130.237.57.68 #trinity.md.kth.se -130.237.57.72 #morpheus.md.kth.se +130.237.57.7 #mdafs-1.md.kth.se >mech.kth.se #Royal Institute of Technology, MECH 130.237.233.142 #matterhorn.mech.kth.se 130.237.233.143 #castor.mech.kth.se diff --git a/src/packaging/RedHat/makesrpm.pl b/src/packaging/RedHat/makesrpm.pl index 54193d0..3524417 100755 --- a/src/packaging/RedHat/makesrpm.pl +++ b/src/packaging/RedHat/makesrpm.pl @@ -169,7 +169,8 @@ if ($changelog) { } # Build an RPM -system("rpmbuild -bs --define \"dist %undefined\" ". +system("rpmbuild -bs --nodeps --define \"dist %undefined\" ". + "--define \"build_modules 0\" ". "--define \"_topdir $tmpdir/rpmdir\" ". "$tmpdir/rpmdir/SPECS/openafs.spec > /dev/null") == 0 or die "rpmbuild failed : $!\n"; diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 1afcc4d..6225fc6 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -266,7 +266,7 @@ Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar Source10: http://www.openafs.org/dl/openafs/%{afsvers}/RELNOTES-%{afsvers} Source11: http://www.openafs.org/dl/openafs/%{afsvers}/ChangeLog -Source20: http://dl.central.org/dl/cellservdb/CellServDB.2015-01-19 +Source20: http://dl.central.org/dl/cellservdb/CellServDB.2016-01-01 Source30: openafs-kernel-version.sh Source996: openafs-kvers-is.sh @@ -1074,9 +1074,9 @@ install -m 755 src/packaging/RedHat/openafs.sysconfig $RPM_BUILD_ROOT/etc/syscon install -m 755 src/packaging/RedHat/openafs-client.init $RPM_BUILD_ROOT%{initdir}/openafs-client install -m 755 src/packaging/RedHat/openafs-server.init $RPM_BUILD_ROOT%{initdir}/openafs-server %else -install -m 755 src/packaging/RedHat/openafs-client.service $RPM_BUILD_ROOT%{_unitdir}/openafs-client.service +install -m 644 src/packaging/RedHat/openafs-client.service $RPM_BUILD_ROOT%{_unitdir}/openafs-client.service install -m 755 src/packaging/RedHat/openafs-client.modules $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/openafs-client.modules -install -m 755 src/packaging/RedHat/openafs-server.service $RPM_BUILD_ROOT%{_unitdir}/openafs-server.service +install -m 644 src/packaging/RedHat/openafs-server.service $RPM_BUILD_ROOT%{_unitdir}/openafs-server.service %endif # Copy PAM modules diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index ae1a562..f9f48fc 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -345,13 +345,19 @@ newEntry(struct rx_call *call, char aname[], afs_int32 flag, afs_int32 oid, * automatic id assignment. */ code = WhoIsThisWithName(call, tt, cid, cname); - if (code != 2) { /* 2 specifies that this is a foreign cell request */ - if (code) - ABORT_WITH(tt, PRPERM); - admin = IsAMemberOf(tt, *cid, SYSADMINID); - } else { - admin = ((!restricted && !strcmp(aname, cname))) || IsAMemberOf(tt, *cid, SYSADMINID); - oid = *cid = SYSADMINID; + if (code && code != 2) + ABORT_WITH(tt, PRPERM); + admin = IsAMemberOf(tt, *cid, SYSADMINID); + if (code == 2 /* foreign cell request */) { + if (!restricted && (strcmp(aname, cname) == 0)) { + /* can't autoregister while providing an owner id */ + if (oid != 0) + ABORT_WITH(tt, PRPERM); + + admin = 1; + oid = SYSADMINID; + *cid = SYSADMINID; + } } if (!CreateOK(tt, *cid, oid, flag, admin)) ABORT_WITH(tt, PRPERM); diff --git a/src/sys/pioctl.c b/src/sys/pioctl.c index 3c0d8af..fb987c2 100644 --- a/src/sys/pioctl.c +++ b/src/sys/pioctl.c @@ -36,8 +36,7 @@ * need to do anything! */ -#else -#if defined(AFS_SGI_ENV) +#elif defined(AFS_SGI_ENV) #pragma weak xlpioctl = lpioctl @@ -47,46 +46,55 @@ lpioctl(char *path, int cmd, void *cmarg, int follow) return (syscall(AFS_PIOCTL, path, cmd, cmarg, follow)); } -#else /* AFS_SGI_ENV */ +#elif defined(AFS_LINUX20_ENV) int lpioctl(char *path, int cmd, void *cmarg, int follow) { - int errcode, rval; -#ifndef AFS_LINUX20_ENV - /* As kauth/user.c says, handle smoothly the case where no AFS system call - * exists (yet). */ - void (*old)(int) = signal(SIGSYS, SIG_IGN); -#endif + int errcode = 0; + int rval; -#if defined(AFS_LINUX20_ENV) rval = proc_afs_syscall(AFSCALL_PIOCTL, (long)path, cmd, (long)cmarg, follow, &errcode); if(rval) errcode = syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, cmd, cmarg, follow); -#elif defined(AFS_DARWIN80_ENV) - rval = ioctl_afs_syscall(AFSCALL_PIOCTL, (long)path, cmd, (long)cmarg, - follow, 0, 0, &errcode); - if (rval) - errcode = rval; -#elif defined(AFS_SUN511_ENV) - rval = ioctl_sun_afs_syscall(AFSCALL_PIOCTL, (uintptr_t)path, cmd, - (uintptr_t)cmarg, follow, 0, 0, &errcode); - if (rval) { - errcode = rval; + + return (errcode); +} + +#else /* AFS_AIX32_ENV */ + +int +lpioctl(char *path, int cmd, void *cmarg, int follow) +{ + int errcode = 0; + /* As kauth/user.c says, handle smoothly the case where no AFS system call + * exists (yet). */ + void (*old)(int) = signal(SIGSYS, SIG_IGN); + +# if defined(AFS_DARWIN80_ENV) || defined(AFS_SUN511_ENV) + { + int rval; /* rval and errcode are distinct for pioctl platforms */ +# if defined(AFS_DARWIN80_ENV) + rval = ioctl_afs_syscall(AFSCALL_PIOCTL, (long)path, cmd, (long)cmarg, + follow, 0, 0, &errcode); +# elif defined(AFS_SUN511_ENV) + rval = ioctl_sun_afs_syscall(AFSCALL_PIOCTL, (uintptr_t)path, cmd, + (uintptr_t)cmarg, follow, 0, 0, &errcode); +# endif /* !AFS_DARWIN80_ENV */ + /* non-zero rval takes precedence over errcode */ + if (rval) + errcode = rval; } -#else +# else /* ! AFS_DARWIN80_ENV || AFS_SUN511_ENV */ errcode = syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, cmd, cmarg, follow); -#endif +# endif -#ifndef AFS_LINUX20_ENV signal(SIGSYS, old); -#endif return (errcode); } -#endif /* !AFS_SGI_ENV */ #endif /* !AFS_AIX32_ENV */ diff --git a/src/venus/afsio.c b/src/venus/afsio.c index c6de1e3..409b397 100644 --- a/src/venus/afsio.c +++ b/src/venus/afsio.c @@ -898,6 +898,7 @@ writeFile(struct cmd_syndesc *as, void *unused) /* stdin on Windows defaults to _O_TEXT mode */ _setmode(0, _O_BINARY); #endif + memset(&InStatus, 0, sizeof(InStatus)); CmdProlog(as, &cell, &realm, &fname, &sSynthLen); afscp_AnonymousAuth(1); diff --git a/src/venus/cacheout.c b/src/venus/cacheout.c index 2a390ad..3d44fd9 100644 --- a/src/venus/cacheout.c +++ b/src/venus/cacheout.c @@ -71,6 +71,7 @@ ListServers(void) char hoststr[16]; ListAddrByAttributes m_attrs; + memset(&m_attrs, 0, sizeof(m_attrs)); memset(&addrs, 0, sizeof(addrs)); memset(&spare3, 0, sizeof(spare3)); code = diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index d5a54cb..1d89d0f 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -1117,7 +1117,10 @@ int afs_syscall(long call, long parm0, long parm1, long parm2, long parm3, long parm4, long parm5, long parm6) { - int code, rval; + int code; +#if defined(AFS_DARWIN80_ENV) || defined(AFS_LINUX20_ENV) + int rval; +#endif #ifdef AFS_LINUX20_ENV #if defined AFS_LINUX_64BIT_KERNEL long long eparm[4]; diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c index c7bfa7e..b29c5d8 100644 --- a/src/vlserver/vlclient.c +++ b/src/vlserver/vlclient.c @@ -824,6 +824,7 @@ handleit(struct cmd_syndesc *as, void *arock) printf("[0x%x %u] (special multi-homed entry)\n", *addrp, *addrp); + memset(&attrs, 0, sizeof(attrs)); attrs.Mask = VLADDR_INDEX; mhaddrs.bulkaddrs_val = 0; mhaddrs.bulkaddrs_len = 0; @@ -899,6 +900,7 @@ handleit(struct cmd_syndesc *as, void *arock) addrs2.bulkaddrs_val = 0; addrs2.bulkaddrs_len = 0; + memset(&attrs, 0, sizeof(attrs)); attrs.Mask = VLADDR_INDEX; attrs.index = (base * VL_MHSRV_PERBLK) + index; code = diff --git a/src/volser/vos.c b/src/volser/vos.c index 3922a93..28b63a3 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -4506,7 +4506,7 @@ ListVLDB(struct cmd_syndesc *as, void *arock) aserver = 0; apart = 0; - attributes.Mask = 0; + memset(&attributes, 0, sizeof(attributes)); lock = (as->parms[3].items ? 1 : 0); /* -lock flag */ quiet = (as->parms[4].items ? 1 : 0); /* -quit flag */ sort = (as->parms[5].items ? 0 : 1); /* -nosort flag */ @@ -5009,7 +5009,7 @@ UnlockVLDB(struct cmd_syndesc *as, void *arock) apart = -1; totalE = 0; - attributes.Mask = 0; + memset(&attributes, 0, sizeof(attributes)); if (as->parms[0].items) { /* server specified */ aserver = GetServer(as->parms[0].items->data); diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index 845af9e..6ef13d7 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -6999,6 +6999,7 @@ UV_SyncServer(afs_uint32 aserver, afs_int32 apart, int flags, int force) aconn = UV_Bind(aserver, AFSCONF_VOLUMEPORT); /* Set up attributes to search VLDB */ + memset(&attributes, 0, sizeof(attributes)); attributes.server = ntohl(aserver); attributes.Mask = VLLIST_SERVER; if ((flags & 1)) {