From owner-svn-src-stable-9@freebsd.org Sun Apr 24 03:13:04 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6354CB11674; Sun, 24 Apr 2016 03:13:04 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3FB6613A8; Sun, 24 Apr 2016 03:13:04 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O3D3ks032433; Sun, 24 Apr 2016 03:13:03 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O3D3RG032429; Sun, 24 Apr 2016 03:13:03 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604240313.u3O3D3RG032429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 24 Apr 2016 03:13:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298528 - in stable/9/sys/ufs: ffs ufs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 03:13:04 -0000 Author: pfg Date: Sun Apr 24 03:13:02 2016 New Revision: 298528 URL: https://svnweb.freebsd.org/changeset/base/298528 Log: MFC r297791: UFS: replace 0 with NULL for pointers. While here also do late initialization of the variables we are changing. Found with devel/coccinelle. Reviewed by: mckusick Modified: stable/9/sys/ufs/ffs/ffs_alloc.c stable/9/sys/ufs/ffs/ffs_snapshot.c stable/9/sys/ufs/ffs/ffs_softdep.c stable/9/sys/ufs/ufs/ufs_lookup.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_alloc.c Sun Apr 24 03:11:52 2016 (r298527) +++ stable/9/sys/ufs/ffs/ffs_alloc.c Sun Apr 24 03:13:02 2016 (r298528) @@ -260,7 +260,6 @@ ffs_realloccg(ip, lbprev, bprev, bpref, static int curfail; int64_t delta; - *bpp = 0; vp = ITOV(ip); fs = ip->i_fs; bp = NULL; @@ -320,6 +319,7 @@ retry: /* * Check for extension in the existing location. */ + *bpp = NULL; cg = dtog(fs, bprev); UFS_LOCK(ump); bno = ffs_fragextend(ip, cg, bprev, osize, nsize); @@ -503,7 +503,7 @@ ffs_reallocblks_ufs1(ap) struct inode *ip; struct vnode *vp; struct buf *sbp, *ebp; - ufs1_daddr_t *bap, *sbap, *ebap = 0; + ufs1_daddr_t *bap, *sbap, *ebap; struct cluster_save *buflist; struct ufsmount *ump; ufs_lbn_t start_lbn, end_lbn; @@ -583,6 +583,7 @@ ffs_reallocblks_ufs1(ap) /* * If the block range spans two block maps, get the second map. */ + ebap = NULL; if (end_lvl == 0 || (idp = &end_ap[end_lvl - 1])->in_off + 1 >= len) { ssize = len; } else { @@ -730,7 +731,7 @@ ffs_reallocblks_ufs2(ap) struct inode *ip; struct vnode *vp; struct buf *sbp, *ebp; - ufs2_daddr_t *bap, *sbap, *ebap = 0; + ufs2_daddr_t *bap, *sbap, *ebap; struct cluster_save *buflist; struct ufsmount *ump; ufs_lbn_t start_lbn, end_lbn; @@ -809,6 +810,7 @@ ffs_reallocblks_ufs2(ap) /* * If the block range spans two block maps, get the second map. */ + ebap = NULL; if (end_lvl == 0 || (idp = &end_ap[end_lvl - 1])->in_off + 1 >= len) { ssize = len; } else { @@ -2732,7 +2734,8 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) return (EINVAL); } vn_start_write(vp, &mp, V_WAIT); - if (mp == 0 || strncmp(mp->mnt_stat.f_fstypename, "ufs", MFSNAMELEN)) { + if (mp == NULL || + strncmp(mp->mnt_stat.f_fstypename, "ufs", MFSNAMELEN)) { vn_finished_write(mp); fdrop(fp, td); return (EINVAL); Modified: stable/9/sys/ufs/ffs/ffs_snapshot.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_snapshot.c Sun Apr 24 03:11:52 2016 (r298527) +++ stable/9/sys/ufs/ffs/ffs_snapshot.c Sun Apr 24 03:13:02 2016 (r298528) @@ -1892,7 +1892,7 @@ retry: * dopersistence sysctl-setable flag to decide on the * persistence needed for file content data. */ - if (savedcbp != 0) { + if (savedcbp != NULL) { bcopy(savedcbp->b_data, cbp->b_data, fs->fs_bsize); bawrite(cbp); if ((vtype == VDIR || dopersistence) && @@ -2385,7 +2385,7 @@ ffs_copyonwrite(devvp, bp) * dopersistence sysctl-setable flag to decide on the * persistence needed for file content data. */ - if (savedcbp != 0) { + if (savedcbp != NULL) { bcopy(savedcbp->b_data, cbp->b_data, fs->fs_bsize); bawrite(cbp); if ((devvp == bp->b_vp || bp->b_vp->v_type == VDIR || Modified: stable/9/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_softdep.c Sun Apr 24 03:11:52 2016 (r298527) +++ stable/9/sys/ufs/ffs/ffs_softdep.c Sun Apr 24 03:13:02 2016 (r298528) @@ -1870,7 +1870,7 @@ softdep_move_dependencies(oldbp, newbp) if (wk->wk_type == D_BMSAFEMAP && bmsafemap_backgroundwrite(WK_BMSAFEMAP(wk), newbp)) dirty = 1; - if (wktail == 0) + if (wktail == NULL) LIST_INSERT_HEAD(&newbp->b_dep, wk, wk_list); else LIST_INSERT_AFTER(wktail, wk, wk_list); @@ -6502,7 +6502,7 @@ softdep_journal_freeblocks(ip, cred, len } } if ((flags & IO_EXT) != 0) - while ((adp = TAILQ_FIRST(&inodedep->id_extupdt)) != 0) + while ((adp = TAILQ_FIRST(&inodedep->id_extupdt)) != NULL) cancel_allocdirect(&inodedep->id_extupdt, adp, freeblks); /* @@ -6752,14 +6752,14 @@ softdep_setup_freeblocks(ip, length, fla if (flags & IO_NORMAL) { merge_inode_lists(&inodedep->id_newinoupdt, &inodedep->id_inoupdt); - while ((adp = TAILQ_FIRST(&inodedep->id_inoupdt)) != 0) + while ((adp = TAILQ_FIRST(&inodedep->id_inoupdt)) != NULL) cancel_allocdirect(&inodedep->id_inoupdt, adp, freeblks); } if (flags & IO_EXT) { merge_inode_lists(&inodedep->id_newextupdt, &inodedep->id_extupdt); - while ((adp = TAILQ_FIRST(&inodedep->id_extupdt)) != 0) + while ((adp = TAILQ_FIRST(&inodedep->id_extupdt)) != NULL) cancel_allocdirect(&inodedep->id_extupdt, adp, freeblks); } @@ -7856,8 +7856,8 @@ indir_trunc(freework, dbn, lbn) struct fs *fs; struct indirdep *indirdep; struct ufsmount *ump; - ufs1_daddr_t *bap1 = 0; - ufs2_daddr_t nb, nnb, *bap2 = 0; + ufs1_daddr_t *bap1; + ufs2_daddr_t nb, nnb, *bap2; ufs_lbn_t lbnadd, nlbn; int i, nblocks, ufs1fmt; int freedblocks; @@ -7942,10 +7942,12 @@ indir_trunc(freework, dbn, lbn) bap1 = (ufs1_daddr_t *)bp->b_data; nb = bap1[freework->fw_off]; ufs1fmt = 1; + bap2 = NULL; } else { bap2 = (ufs2_daddr_t *)bp->b_data; nb = bap2[freework->fw_off]; ufs1fmt = 0; + bap1 = NULL; } level = lbn_level(lbn); needj = MOUNTEDSUJ(UFSTOVFS(ump)) != 0; @@ -8119,7 +8121,7 @@ setup_newdir(dap, newinum, dinum, newdir struct newblk *newblk; struct pagedep *pagedep; struct inodedep *inodedep; - struct newdirblk *newdirblk = 0; + struct newdirblk *newdirblk; struct mkdir *mkdir1, *mkdir2; struct worklist *wk; struct jaddref *jaddref; @@ -8244,7 +8246,7 @@ softdep_setup_directory_add(bp, dp, diro struct newblk *newblk; struct pagedep *pagedep; struct inodedep *inodedep; - struct newdirblk *newdirblk = 0; + struct newdirblk *newdirblk; struct mkdir *mkdir1, *mkdir2; struct jaddref *jaddref; struct mount *mp; @@ -8272,6 +8274,7 @@ softdep_setup_directory_add(bp, dp, diro dap->da_state = ATTACHED; LIST_INIT(&dap->da_jwork); isindir = bp->b_lblkno >= NDADDR; + newdirblk = NULL; if (isnewblk && (isindir ? blkoff(fs, diroffset) : fragoff(fs, diroffset)) == 0) { newdirblk = malloc(sizeof(struct newdirblk), @@ -8362,7 +8365,7 @@ softdep_setup_directory_add(bp, dp, diro inodedep->id_mkdiradd = dap; } else if (inodedep->id_mkdiradd) merge_diradd(inodedep, dap); - if (newdirblk) { + if (newdirblk != NULL) { /* * There is nothing to do if we are already tracking * this block. @@ -10312,13 +10315,13 @@ cancel_indirdep(indirdep, bp, freeblks) * Pass in bp for blocks still have journal writes * pending so we can cancel them on their own. */ - while ((aip = LIST_FIRST(&indirdep->ir_deplisthd)) != 0) + while ((aip = LIST_FIRST(&indirdep->ir_deplisthd)) != NULL) cancel_allocindir(aip, bp, freeblks, 0); - while ((aip = LIST_FIRST(&indirdep->ir_donehd)) != 0) + while ((aip = LIST_FIRST(&indirdep->ir_donehd)) != NULL) cancel_allocindir(aip, NULL, freeblks, 0); - while ((aip = LIST_FIRST(&indirdep->ir_writehd)) != 0) + while ((aip = LIST_FIRST(&indirdep->ir_writehd)) != NULL) cancel_allocindir(aip, NULL, freeblks, 0); - while ((aip = LIST_FIRST(&indirdep->ir_completehd)) != 0) + while ((aip = LIST_FIRST(&indirdep->ir_completehd)) != NULL) cancel_allocindir(aip, NULL, freeblks, 0); /* * If there are pending partial truncations we need to keep the @@ -11332,7 +11335,7 @@ handle_written_indirdep(indirdep, bp, bp * the indirdep's pointer is not yet written. Otherwise * free them here. */ - while ((aip = LIST_FIRST(&indirdep->ir_writehd)) != 0) { + while ((aip = LIST_FIRST(&indirdep->ir_writehd)) != NULL) { LIST_REMOVE(aip, ai_next); if ((indirdep->ir_state & DEPCOMPLETE) == 0) { LIST_INSERT_HEAD(&indirdep->ir_completehd, aip, @@ -11347,7 +11350,7 @@ handle_written_indirdep(indirdep, bp, bp * the done list to the write list after updating the pointers. */ if (TAILQ_EMPTY(&indirdep->ir_trunc)) { - while ((aip = LIST_FIRST(&indirdep->ir_donehd)) != 0) { + while ((aip = LIST_FIRST(&indirdep->ir_donehd)) != NULL) { handle_allocindir_partdone(aip); if (aip == LIST_FIRST(&indirdep->ir_donehd)) panic("disk_write_complete: not gone"); Modified: stable/9/sys/ufs/ufs/ufs_lookup.c ============================================================================== --- stable/9/sys/ufs/ufs/ufs_lookup.c Sun Apr 24 03:11:52 2016 (r298527) +++ stable/9/sys/ufs/ufs/ufs_lookup.c Sun Apr 24 03:13:02 2016 (r298528) @@ -1251,7 +1251,8 @@ out: * drop its snapshot reference so that it will be reclaimed * when last open reference goes away. */ - if (ip != 0 && (ip->i_flags & SF_SNAPSHOT) != 0 && ip->i_effnlink == 0) + if (ip != NULL && (ip->i_flags & SF_SNAPSHOT) != 0 && + ip->i_effnlink == 0) UFS_SNAPGONE(ip); return (error); } From owner-svn-src-stable-9@freebsd.org Sun Apr 24 08:45:45 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F5B5B125C6; Sun, 24 Apr 2016 08:45:45 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 409E01836; Sun, 24 Apr 2016 08:45:45 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O8jiQ9032628; Sun, 24 Apr 2016 08:45:44 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O8jigA032624; Sun, 24 Apr 2016 08:45:44 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201604240845.u3O8jigA032624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sun, 24 Apr 2016 08:45:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298534 - in stable/9/sys/cddl: compat/opensolaris/sys contrib/opensolaris/uts/common/fs contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 08:45:45 -0000 Author: avg Date: Sun Apr 24 08:45:43 2016 New Revision: 298534 URL: https://svnweb.freebsd.org/changeset/base/298534 Log: MFC r297513: remove emulation of VFS_HOLD and VFS_RELE from opensolaris compat Modified: stable/9/sys/cddl/compat/opensolaris/sys/vfs.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/compat/opensolaris/sys/vfs.h ============================================================================== --- stable/9/sys/cddl/compat/opensolaris/sys/vfs.h Sun Apr 24 08:39:55 2016 (r298533) +++ stable/9/sys/cddl/compat/opensolaris/sys/vfs.h Sun Apr 24 08:45:43 2016 (r298534) @@ -54,17 +54,6 @@ typedef struct mount vfs_t; #define VFS_NOSETUID MNT_NOSUID #define VFS_NOEXEC MNT_NOEXEC -#define VFS_HOLD(vfsp) do { \ - MNT_ILOCK(vfsp); \ - MNT_REF(vfsp); \ - MNT_IUNLOCK(vfsp); \ -} while (0) -#define VFS_RELE(vfsp) do { \ - MNT_ILOCK(vfsp); \ - MNT_REL(vfsp); \ - MNT_IUNLOCK(vfsp); \ -} while (0) - #define fs_vscan(vp, cr, async) (0) #define VROOT VV_ROOT Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c Sun Apr 24 08:39:55 2016 (r298533) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c Sun Apr 24 08:45:43 2016 (r298534) @@ -583,7 +583,9 @@ gfs_root_create(size_t size, vfs_t *vfsp { vnode_t *vp; +#ifdef illumos VFS_HOLD(vfsp); +#endif vp = gfs_dir_create(size, NULL, vfsp, ops, entries, inode_cb, maxlen, readdir_cb, lookup_cb); /* Manually set the inode */ @@ -694,7 +696,9 @@ found: vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); } else { ASSERT(vp->v_vfsp != NULL); +#ifdef illumos VFS_RELE(vp->v_vfsp); +#endif } #ifdef TODO if (vp->v_flag & V_XATTRDIR) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sun Apr 24 08:39:55 2016 (r298533) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sun Apr 24 08:45:43 2016 (r298534) @@ -1441,7 +1441,14 @@ getzfsvfs(const char *dsname, zfsvfs_t * mutex_enter(&os->os_user_ptr_lock); *zfvp = dmu_objset_get_user(os); if (*zfvp) { +#ifdef illumos VFS_HOLD((*zfvp)->z_vfs); +#else + if (vfs_busy((*zfvp)->z_vfs, 0) != 0) { + *zfvp = NULL; + error = SET_ERROR(ESRCH); + } +#endif } else { error = SET_ERROR(ESRCH); } @@ -1485,7 +1492,11 @@ zfsvfs_rele(zfsvfs_t *zfsvfs, void *tag) rrw_exit(&zfsvfs->z_teardown_lock, tag); if (zfsvfs->z_vfs) { +#ifdef illumos VFS_RELE(zfsvfs->z_vfs); +#else + vfs_unbusy(zfsvfs->z_vfs); +#endif } else { dmu_objset_disown(zfsvfs->z_os, zfsvfs); zfsvfs_free(zfsvfs); @@ -3049,11 +3060,13 @@ zfs_get_vfs(const char *resource) mtx_lock(&mountlist_mtx); TAILQ_FOREACH(vfsp, &mountlist, mnt_list) { if (strcmp(refstr_value(vfsp->vfs_resource), resource) == 0) { - VFS_HOLD(vfsp); + if (vfs_busy(vfsp, MBF_MNTLSTLOCK) != 0) + vfsp = NULL; break; } } - mtx_unlock(&mountlist_mtx); + if (vfsp == NULL) + mtx_unlock(&mountlist_mtx); return (vfsp); } @@ -3506,7 +3519,11 @@ zfs_unmount_snap(const char *snapname) ASSERT(!dsl_pool_config_held(dmu_objset_pool(zfsvfs->z_os))); err = vn_vfswlock(vfsp->vfs_vnodecovered); +#ifdef illumos VFS_RELE(vfsp); +#else + vfs_unbusy(vfsp); +#endif if (err != 0) return (SET_ERROR(err)); @@ -3733,7 +3750,11 @@ zfs_ioc_rollback(const char *fsname, nvl resume_err = zfs_resume_fs(zfsvfs, fsname); error = error ? error : resume_err; } +#ifdef illumos VFS_RELE(zfsvfs->z_vfs); +#else + vfs_unbusy(zfsvfs->z_vfs); +#endif } else { error = dsl_dataset_rollback(fsname, NULL, outnvl); } @@ -4273,7 +4294,11 @@ zfs_ioc_recv(zfs_cmd_t *zc) if (error == 0) error = zfs_resume_fs(zfsvfs, tofs); error = error ? error : end_err; +#ifdef illumos VFS_RELE(zfsvfs->z_vfs); +#else + vfs_unbusy(zfsvfs->z_vfs); +#endif } else { error = dmu_recv_end(&drc, NULL); } @@ -4775,7 +4800,11 @@ zfs_ioc_userspace_upgrade(zfs_cmd_t *zc) } if (error == 0) error = dmu_objset_userspace_upgrade(zfsvfs->z_os); +#ifdef illumos VFS_RELE(zfsvfs->z_vfs); +#else + vfs_unbusy(zfsvfs->z_vfs); +#endif } else { /* XXX kind of reading contents without owning */ error = dmu_objset_hold(zc->zc_name, FTAG, &os); Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sun Apr 24 08:39:55 2016 (r298533) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sun Apr 24 08:45:43 2016 (r298534) @@ -741,7 +741,9 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu if (vp->v_type != VFIFO) VN_LOCK_ASHARE(vp); +#ifdef illumos VFS_HOLD(zfsvfs->z_vfs); +#endif return (zp); } @@ -1426,7 +1428,9 @@ zfs_znode_free(znode_t *zp) kmem_cache_free(znode_cache, zp); +#ifdef illumos VFS_RELE(zfsvfs->z_vfs); +#endif } void From owner-svn-src-stable-9@freebsd.org Mon Apr 25 00:52:38 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6DEEB1C9A5; Mon, 25 Apr 2016 00:52:38 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A490E1BE0; Mon, 25 Apr 2016 00:52:38 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3P0qbB8030249; Mon, 25 Apr 2016 00:52:37 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3P0qbfH030248; Mon, 25 Apr 2016 00:52:37 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604250052.u3P0qbfH030248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 25 Apr 2016 00:52:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298558 - stable/9/sys/fs/ext2fs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2016 00:52:38 -0000 Author: pfg Date: Mon Apr 25 00:52:37 2016 New Revision: 298558 URL: https://svnweb.freebsd.org/changeset/base/298558 Log: MFC r297796: ext2fs: replace 0 with NULL for pointers. While here do late initialization of ebap, similar as was done in UFS. Found with devel/coccinelle. Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_alloc.c Mon Apr 25 00:51:13 2016 (r298557) +++ stable/9/sys/fs/ext2fs/ext2_alloc.c Mon Apr 25 00:52:37 2016 (r298558) @@ -161,7 +161,7 @@ ext2_reallocblks(struct vop_reallocblks_ struct inode *ip; struct vnode *vp; struct buf *sbp, *ebp; - uint32_t *bap, *sbap, *ebap = 0; + uint32_t *bap, *sbap, *ebap; struct ext2mount *ump; struct cluster_save *buflist; struct indir start_ap[NIADDR + 1], end_ap[NIADDR + 1], *idp; @@ -231,6 +231,7 @@ ext2_reallocblks(struct vop_reallocblks_ /* * If the block range spans two block maps, get the second map. */ + ebap = NULL; if (end_lvl == 0 || (idp = &end_ap[end_lvl - 1])->in_off + 1 >= len) { ssize = len; } else { From owner-svn-src-stable-9@freebsd.org Tue Apr 26 07:40:57 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80672B1C97E; Tue, 26 Apr 2016 07:40:57 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5156C12FE; Tue, 26 Apr 2016 07:40:57 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3Q7eu6S099635; Tue, 26 Apr 2016 07:40:56 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3Q7euFe099634; Tue, 26 Apr 2016 07:40:56 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201604260740.u3Q7euFe099634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 26 Apr 2016 07:40:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298622 - stable/9/sys/amd64/amd64 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 07:40:57 -0000 Author: avg Date: Tue Apr 26 07:40:56 2016 New Revision: 298622 URL: https://svnweb.freebsd.org/changeset/base/298622 Log: MFC r297846: [amd64] dtrace_invop handler is to be called only for kernel exceptions Modified: stable/9/sys/amd64/amd64/exception.S Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/exception.S ============================================================================== --- stable/9/sys/amd64/amd64/exception.S Tue Apr 26 07:40:07 2016 (r298621) +++ stable/9/sys/amd64/amd64/exception.S Tue Apr 26 07:40:56 2016 (r298622) @@ -212,6 +212,8 @@ alltraps_pushregs_no_rdi: * interrupt. For all other trap types, just handle them in * the usual way. */ + testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ + jnz calltrap /* ignore userland traps */ cmpl $T_BPTFLT,TF_TRAPNO(%rsp) jne calltrap From owner-svn-src-stable-9@freebsd.org Tue Apr 26 12:00:06 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E031B1BF17; Tue, 26 Apr 2016 12:00:06 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9B591039; Tue, 26 Apr 2016 12:00:05 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QC04Zb078058; Tue, 26 Apr 2016 12:00:04 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QC04d6078057; Tue, 26 Apr 2016 12:00:04 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201604261200.u3QC04d6078057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 26 Apr 2016 12:00:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298629 - stable/9/sbin/geom/class/part X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 12:00:06 -0000 Author: ae Date: Tue Apr 26 12:00:04 2016 New Revision: 298629 URL: https://svnweb.freebsd.org/changeset/base/298629 Log: MFC r297820: Fix the problem, when gpart(8) can't write both bootcode and partcode in one command due to wrong file size limit. Do not use bootcode size to calculate partsize limit. Also add report message about successful partcode writing. Modified: stable/9/sbin/geom/class/part/geom_part.c Directory Properties: stable/9/sbin/geom/class/part/ (props changed) Modified: stable/9/sbin/geom/class/part/geom_part.c ============================================================================== --- stable/9/sbin/geom/class/part/geom_part.c Tue Apr 26 11:55:28 2016 (r298628) +++ stable/9/sbin/geom/class/part/geom_part.c Tue Apr 26 12:00:04 2016 (r298629) @@ -1115,6 +1115,7 @@ gpart_write_partcode(struct ggeom *gp, i err(EXIT_FAILURE, "%s", dsf); free(buf); close(fd); + printf("partcode written to %s\n", pp->lg_name); } else errx(EXIT_FAILURE, "invalid partition index"); } @@ -1161,6 +1162,9 @@ gpart_write_partcode_vtoc8(struct ggeom } if (installed == 0) errx(EXIT_FAILURE, "%s: no partitions", gp->lg_name); + else + printf("partcode written to %s\n", + idx != 0 ? pp->lg_name: gp->lg_name); } static void @@ -1182,10 +1186,8 @@ gpart_bootcode(struct gctl_req *req, uns bootcode); if (error) errc(EXIT_FAILURE, error, "internal error"); - } else { + } else bootcode = NULL; - bootsize = 0; - } s = gctl_get_ascii(req, "class"); if (s == NULL) @@ -1209,21 +1211,23 @@ gpart_bootcode(struct gctl_req *req, uns s = find_geomcfg(gp, "scheme"); if (s == NULL) errx(EXIT_FAILURE, "Scheme not found for geom %s", gp->lg_name); - vtoc8 = 0; if (strcmp(s, "VTOC8") == 0) vtoc8 = 1; + else + vtoc8 = 0; if (gctl_has_param(req, GPART_PARAM_PARTCODE)) { s = gctl_get_ascii(req, GPART_PARAM_PARTCODE); - partsize = vtoc8 != 0 ? VTOC_BOOTSIZE : bootsize * 1024; + if (vtoc8 != 0) + partsize = VTOC_BOOTSIZE; + else + partsize = 1024 * 1024; /* Arbitrary limit. */ partcode = gpart_bootfile_read(s, &partsize); error = gctl_delete_param(req, GPART_PARAM_PARTCODE); if (error) errc(EXIT_FAILURE, error, "internal error"); - } else { + } else partcode = NULL; - partsize = 0; - } if (gctl_has_param(req, GPART_PARAM_INDEX)) { if (partcode == NULL) From owner-svn-src-stable-9@freebsd.org Wed Apr 27 15:25:20 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13816B1ECB6; Wed, 27 Apr 2016 15:25:20 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1A5C17A7; Wed, 27 Apr 2016 15:25:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3RFPJJX082082; Wed, 27 Apr 2016 15:25:19 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3RFPIGa082079; Wed, 27 Apr 2016 15:25:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201604271525.u3RFPIGa082079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 Apr 2016 15:25:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298700 - in stable/9: contrib/ntp contrib/ntp/html contrib/ntp/include contrib/ntp/lib/isc contrib/ntp/lib/isc/include/isc contrib/ntp/libntp contrib/ntp/ntpd contrib/ntp/ntpdate contr... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 15:25:20 -0000 Author: delphij Date: Wed Apr 27 15:25:18 2016 New Revision: 298700 URL: https://svnweb.freebsd.org/changeset/base/298700 Log: MFC r298695: MFV r298691: ntp 4.2.8p7. Security: CVE-2016-1547, CVE-2016-1548, CVE-2016-1549, CVE-2016-1550 Security: CVE-2016-1551, CVE-2016-2516, CVE-2016-2517, CVE-2016-2518 Security: CVE-2016-2519 Security: FreeBSD-SA-16:16.ntp With hat: so Added: stable/9/contrib/ntp/README.pullrequests - copied unchanged from r298695, head/contrib/ntp/README.pullrequests stable/9/contrib/ntp/lib/isc/tsmemcmp.c - copied unchanged from r298695, head/contrib/ntp/lib/isc/tsmemcmp.c stable/9/contrib/ntp/tests/libntp/run-tsafememcmp.c - copied unchanged from r298695, head/contrib/ntp/tests/libntp/run-tsafememcmp.c stable/9/contrib/ntp/tests/libntp/tsafememcmp.c - copied unchanged from r298695, head/contrib/ntp/tests/libntp/tsafememcmp.c Modified: stable/9/contrib/ntp/ChangeLog stable/9/contrib/ntp/CommitLog stable/9/contrib/ntp/Makefile.am stable/9/contrib/ntp/Makefile.in stable/9/contrib/ntp/NEWS stable/9/contrib/ntp/config.h.in stable/9/contrib/ntp/configure stable/9/contrib/ntp/configure.ac stable/9/contrib/ntp/html/authentic.html stable/9/contrib/ntp/html/monopt.html stable/9/contrib/ntp/html/xleave.html stable/9/contrib/ntp/include/ntp.h stable/9/contrib/ntp/include/ntp_keyacc.h stable/9/contrib/ntp/include/ntp_refclock.h stable/9/contrib/ntp/include/ntp_stdlib.h stable/9/contrib/ntp/include/ntp_types.h stable/9/contrib/ntp/include/ntp_worker.h stable/9/contrib/ntp/include/recvbuff.h stable/9/contrib/ntp/lib/isc/hmacmd5.c stable/9/contrib/ntp/lib/isc/hmacsha.c stable/9/contrib/ntp/lib/isc/include/isc/string.h stable/9/contrib/ntp/libntp/Makefile.am stable/9/contrib/ntp/libntp/Makefile.in stable/9/contrib/ntp/libntp/a_md5encrypt.c stable/9/contrib/ntp/libntp/authkeys.c stable/9/contrib/ntp/libntp/authreadkeys.c stable/9/contrib/ntp/libntp/is_ip_address.c stable/9/contrib/ntp/libntp/ntp_intres.c stable/9/contrib/ntp/libntp/ntp_worker.c stable/9/contrib/ntp/libntp/recvbuff.c stable/9/contrib/ntp/libntp/work_fork.c stable/9/contrib/ntp/libntp/work_thread.c stable/9/contrib/ntp/ntpd/invoke-ntp.conf.texi stable/9/contrib/ntp/ntpd/invoke-ntp.keys.texi stable/9/contrib/ntp/ntpd/invoke-ntpd.texi stable/9/contrib/ntp/ntpd/ntp.conf.5man stable/9/contrib/ntp/ntpd/ntp.conf.5mdoc stable/9/contrib/ntp/ntpd/ntp.conf.def stable/9/contrib/ntp/ntpd/ntp.conf.html stable/9/contrib/ntp/ntpd/ntp.conf.man.in stable/9/contrib/ntp/ntpd/ntp.conf.mdoc.in stable/9/contrib/ntp/ntpd/ntp.keys.5man stable/9/contrib/ntp/ntpd/ntp.keys.5mdoc stable/9/contrib/ntp/ntpd/ntp.keys.html stable/9/contrib/ntp/ntpd/ntp.keys.man.in stable/9/contrib/ntp/ntpd/ntp.keys.mdoc.in stable/9/contrib/ntp/ntpd/ntp_control.c stable/9/contrib/ntp/ntpd/ntp_io.c stable/9/contrib/ntp/ntpd/ntp_proto.c stable/9/contrib/ntp/ntpd/ntp_request.c stable/9/contrib/ntp/ntpd/ntp_timer.c stable/9/contrib/ntp/ntpd/ntpd-opts.c stable/9/contrib/ntp/ntpd/ntpd-opts.h stable/9/contrib/ntp/ntpd/ntpd.1ntpdman stable/9/contrib/ntp/ntpd/ntpd.1ntpdmdoc stable/9/contrib/ntp/ntpd/ntpd.c stable/9/contrib/ntp/ntpd/ntpd.html stable/9/contrib/ntp/ntpd/ntpd.man.in stable/9/contrib/ntp/ntpd/ntpd.mdoc.in stable/9/contrib/ntp/ntpdate/ntpdate.c stable/9/contrib/ntp/ntpdc/invoke-ntpdc.texi stable/9/contrib/ntp/ntpdc/ntpdc-opts.c stable/9/contrib/ntp/ntpdc/ntpdc-opts.h stable/9/contrib/ntp/ntpdc/ntpdc.1ntpdcman stable/9/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc stable/9/contrib/ntp/ntpdc/ntpdc.html stable/9/contrib/ntp/ntpdc/ntpdc.man.in stable/9/contrib/ntp/ntpdc/ntpdc.mdoc.in stable/9/contrib/ntp/ntpq/invoke-ntpq.texi stable/9/contrib/ntp/ntpq/ntpq-opts.c stable/9/contrib/ntp/ntpq/ntpq-opts.def stable/9/contrib/ntp/ntpq/ntpq-opts.h stable/9/contrib/ntp/ntpq/ntpq-subs.c stable/9/contrib/ntp/ntpq/ntpq.1ntpqman stable/9/contrib/ntp/ntpq/ntpq.1ntpqmdoc stable/9/contrib/ntp/ntpq/ntpq.c stable/9/contrib/ntp/ntpq/ntpq.h stable/9/contrib/ntp/ntpq/ntpq.html stable/9/contrib/ntp/ntpq/ntpq.man.in stable/9/contrib/ntp/ntpq/ntpq.mdoc.in stable/9/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd.html stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in stable/9/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in stable/9/contrib/ntp/packageinfo.sh stable/9/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman stable/9/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc stable/9/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html stable/9/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in stable/9/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in stable/9/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi stable/9/contrib/ntp/scripts/invoke-plot_summary.texi stable/9/contrib/ntp/scripts/invoke-summary.texi stable/9/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi stable/9/contrib/ntp/scripts/ntp-wait/ntp-wait-opts stable/9/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman stable/9/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc stable/9/contrib/ntp/scripts/ntp-wait/ntp-wait.html stable/9/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in stable/9/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in stable/9/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi stable/9/contrib/ntp/scripts/ntpsweep/ntpsweep-opts stable/9/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman stable/9/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc stable/9/contrib/ntp/scripts/ntpsweep/ntpsweep.html stable/9/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in stable/9/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in stable/9/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi stable/9/contrib/ntp/scripts/ntptrace/ntptrace-opts stable/9/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman stable/9/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc stable/9/contrib/ntp/scripts/ntptrace/ntptrace.html stable/9/contrib/ntp/scripts/ntptrace/ntptrace.man.in stable/9/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in stable/9/contrib/ntp/scripts/plot_summary-opts stable/9/contrib/ntp/scripts/plot_summary.1plot_summaryman stable/9/contrib/ntp/scripts/plot_summary.1plot_summarymdoc stable/9/contrib/ntp/scripts/plot_summary.html stable/9/contrib/ntp/scripts/plot_summary.man.in stable/9/contrib/ntp/scripts/plot_summary.mdoc.in stable/9/contrib/ntp/scripts/summary-opts stable/9/contrib/ntp/scripts/summary.1summaryman stable/9/contrib/ntp/scripts/summary.1summarymdoc stable/9/contrib/ntp/scripts/summary.html stable/9/contrib/ntp/scripts/summary.man.in stable/9/contrib/ntp/scripts/summary.mdoc.in stable/9/contrib/ntp/scripts/update-leap/invoke-update-leap.texi stable/9/contrib/ntp/scripts/update-leap/update-leap-opts stable/9/contrib/ntp/scripts/update-leap/update-leap.1update-leapman stable/9/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc stable/9/contrib/ntp/scripts/update-leap/update-leap.html stable/9/contrib/ntp/scripts/update-leap/update-leap.man.in stable/9/contrib/ntp/scripts/update-leap/update-leap.mdoc.in stable/9/contrib/ntp/sntp/config.h.in stable/9/contrib/ntp/sntp/configure stable/9/contrib/ntp/sntp/crypto.c stable/9/contrib/ntp/sntp/include/version.def stable/9/contrib/ntp/sntp/include/version.texi stable/9/contrib/ntp/sntp/invoke-sntp.texi stable/9/contrib/ntp/sntp/m4/ntp_libntp.m4 stable/9/contrib/ntp/sntp/m4/version.m4 stable/9/contrib/ntp/sntp/sntp-opts.c stable/9/contrib/ntp/sntp/sntp-opts.h stable/9/contrib/ntp/sntp/sntp.1sntpman stable/9/contrib/ntp/sntp/sntp.1sntpmdoc stable/9/contrib/ntp/sntp/sntp.html stable/9/contrib/ntp/sntp/sntp.man.in stable/9/contrib/ntp/sntp/sntp.mdoc.in stable/9/contrib/ntp/sntp/version.c stable/9/contrib/ntp/tests/libntp/Makefile.am stable/9/contrib/ntp/tests/libntp/Makefile.in stable/9/contrib/ntp/tests/libntp/lfpfunc.c stable/9/contrib/ntp/tests/libntp/run-lfpfunc.c stable/9/contrib/ntp/tests/libntp/run-timevalops.c stable/9/contrib/ntp/tests/libntp/ssl_init.c stable/9/contrib/ntp/tests/libntp/timespecops.c stable/9/contrib/ntp/tests/libntp/timevalops.c stable/9/contrib/ntp/tests/ntpq/Makefile.am stable/9/contrib/ntp/tests/ntpq/Makefile.in stable/9/contrib/ntp/util/invoke-ntp-keygen.texi stable/9/contrib/ntp/util/ntp-keygen-opts.c stable/9/contrib/ntp/util/ntp-keygen-opts.h stable/9/contrib/ntp/util/ntp-keygen.1ntp-keygenman stable/9/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc stable/9/contrib/ntp/util/ntp-keygen.html stable/9/contrib/ntp/util/ntp-keygen.man.in stable/9/contrib/ntp/util/ntp-keygen.mdoc.in stable/9/usr.sbin/ntp/config.h stable/9/usr.sbin/ntp/doc/ntp-keygen.8 stable/9/usr.sbin/ntp/doc/ntp.conf.5 stable/9/usr.sbin/ntp/doc/ntp.keys.5 stable/9/usr.sbin/ntp/doc/ntpd.8 stable/9/usr.sbin/ntp/doc/ntpdc.8 stable/9/usr.sbin/ntp/doc/ntpq.8 stable/9/usr.sbin/ntp/doc/sntp.8 stable/9/usr.sbin/ntp/libntp/Makefile stable/9/usr.sbin/ntp/scripts/mkver Directory Properties: stable/9/contrib/ntp/ (props changed) stable/9/usr.sbin/ntp/ (props changed) Modified: stable/9/contrib/ntp/ChangeLog ============================================================================== --- stable/9/contrib/ntp/ChangeLog Wed Apr 27 15:24:33 2016 (r298699) +++ stable/9/contrib/ntp/ChangeLog Wed Apr 27 15:25:18 2016 (r298700) @@ -1,4 +1,65 @@ --- +(4.2.8p7) 2016/04/26 Released by Harlan Stenn + +* [Sec 2901] KoD packets must have non-zero transmit timestamps. HStenn. +* [Sec 2936] Skeleton Key: Any system knowing the trusted key can serve + time. Include passive servers in this check. HStenn. +* [Sec 2945] Additional KoD packet checks. HStenn. +* [Sec 2978] Interleave can be partially triggered. HStenn. +* [Sec 3007] Validate crypto-NAKs. Danny Mayer. +* [Sec 3008] Always check the return value of ctl_getitem(). + - initial work by HStenn + - Additional cleanup of ctl_getitem by perlinger@ntp.org +* [Sec 3009] Crafted addpeer with hmode > 7 causes OOB error. perlinger@ntp.org + - added more stringent checks on packet content +* [Sec 3010] remote configuration trustedkey/requestkey values + are not properly validated. perlinger@ntp.org + - sidekick: Ignore keys that have an unsupported MAC algorithm + but are otherwise well-formed +* [Sec 3011] Duplicate IPs on unconfig directives will cause an assertion botch + - graciously accept the same IP multiple times. perlinger@ntp.org +* [Sec 3020] Refclock impersonation. HStenn. +* [Bug 2831] Segmentation Fault in DNS lookup during startup. perlinger@ntp.org + - fixed yet another race condition in the threaded resolver code. +* [Bug 2858] bool support. Use stdbool.h when available. HStenn. +* [Bug 2879] Improve NTP security against timing attacks. perlinger@ntp.org + - integrated patches by Loganaden Velvidron + with some modifications & unit tests +* [Bug 2952] Symmetric active/passive mode is broken. HStenn. +* [Bug 2960] async name resolution fixes for chroot() environments. + Reinhard Max. +* [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org +* [Bug 2995] Fixes to compile on Windows +* [Bug 2999] out-of-bounds access in 'is_safe_filename()'. perlinger@ntp.org +* [Bug 3013] Fix for ssl_init.c SHA1 test. perlinger@ntp.org + - Patch provided by Ch. Weisgerber +* [Bug 3015] ntpq: config-from-file: "request contains an unprintable character" + - A change related to [Bug 2853] forbids trailing white space in + remote config commands. perlinger@ntp.org +* [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - report and patch from Aleksandr Kostikov. + - Overhaul of Windows IO completion port handling. perlinger@ntp.org +* [Bug 3022] authkeys.c should be refactored. perlinger@ntp.org + - fixed memory leak in access list (auth[read]keys.c) + - refactored handling of key access lists (auth[read]keys.c) + - reduced number of error branches (authreadkeys.c) +* [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org +* [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. +* [Bug 3031] ntp broadcastclient unable to synchronize to an server + when the time of server changed. perlinger@ntp.org + - Check the initial delay calculation and reject/unpeer the broadcast + server if the delay exceeds 50ms. Retry again after the next + broadcast packet. +* [Bug 3036] autokey trips an INSIST in authistrustedip(). Harlan Stenn. +* Document ntp.key's optional IP list in authenetic.html. Harlan Stenn. +* Update html/xleave.html documentation. Harlan Stenn. +* Update ntp.conf documentation. Harlan Stenn. +* Fix some Credit: attributions in the NEWS file. Harlan Stenn. +* Fix typo in html/monopt.html. Harlan Stenn. +* Add README.pullrequests. Harlan Stenn. +* Cleanup to include/ntp.h. Harlan Stenn. + +--- (4.2.8p6) 2016/01/20 Released by Harlan Stenn * [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn. @@ -92,6 +153,7 @@ * Update scripts/calc_tickadj/Makefile.am. Harlan Stenn. --- +(4.2.8p4) 2015/10/21 Released by Harlan Stenn * [Sec 2899] CVE-2014-9297 perlinger@ntp.org * [Sec 2901] Drop invalid packet before checking KoD. Check for all KoD's. Modified: stable/9/contrib/ntp/CommitLog ============================================================================== --- stable/9/contrib/ntp/CommitLog Wed Apr 27 15:24:33 2016 (r298699) +++ stable/9/contrib/ntp/CommitLog Wed Apr 27 15:25:18 2016 (r298700) @@ -1,3 +1,1130 @@ +ChangeSet@1.3669, 2016-04-26 20:30:51-04:00, stenn@deacon.udel.edu + NTP_4_2_8P7 + TAG: NTP_4_2_8P7 + + ChangeLog@1.1820 +1 -0 + NTP_4_2_8P7 + + ntpd/invoke-ntp.conf.texi@1.198 +38 -20 + NTP_4_2_8P7 + + ntpd/invoke-ntp.keys.texi@1.189 +1 -1 + NTP_4_2_8P7 + + ntpd/invoke-ntpd.texi@1.505 +2 -2 + NTP_4_2_8P7 + + ntpd/ntp.conf.5man@1.232 +43 -24 + NTP_4_2_8P7 + + ntpd/ntp.conf.5mdoc@1.232 +40 -18 + NTP_4_2_8P7 + + ntpd/ntp.conf.html@1.184 +34 -10 + NTP_4_2_8P7 + + ntpd/ntp.conf.man.in@1.232 +43 -24 + NTP_4_2_8P7 + + ntpd/ntp.conf.mdoc.in@1.232 +40 -18 + NTP_4_2_8P7 + + ntpd/ntp.keys.5man@1.223 +2 -2 + NTP_4_2_8P7 + + ntpd/ntp.keys.5mdoc@1.223 +2 -2 + NTP_4_2_8P7 + + ntpd/ntp.keys.html@1.185 +1 -1 + NTP_4_2_8P7 + + ntpd/ntp.keys.man.in@1.223 +2 -2 + NTP_4_2_8P7 + + ntpd/ntp.keys.mdoc.in@1.223 +2 -2 + NTP_4_2_8P7 + + ntpd/ntpd-opts.c@1.527 +7 -7 + NTP_4_2_8P7 + + ntpd/ntpd-opts.h@1.526 +3 -3 + NTP_4_2_8P7 + + ntpd/ntpd.1ntpdman@1.334 +3 -3 + NTP_4_2_8P7 + + ntpd/ntpd.1ntpdmdoc@1.334 +2 -2 + NTP_4_2_8P7 + + ntpd/ntpd.html@1.178 +2 -2 + NTP_4_2_8P7 + + ntpd/ntpd.man.in@1.334 +3 -3 + NTP_4_2_8P7 + + ntpd/ntpd.mdoc.in@1.334 +2 -2 + NTP_4_2_8P7 + + ntpdc/invoke-ntpdc.texi@1.502 +2 -2 + NTP_4_2_8P7 + + ntpdc/ntpdc-opts.c@1.520 +7 -7 + NTP_4_2_8P7 + + ntpdc/ntpdc-opts.h@1.519 +3 -3 + NTP_4_2_8P7 + + ntpdc/ntpdc.1ntpdcman@1.333 +3 -3 + NTP_4_2_8P7 + + ntpdc/ntpdc.1ntpdcmdoc@1.333 +2 -2 + NTP_4_2_8P7 + + ntpdc/ntpdc.html@1.346 +2 -2 + NTP_4_2_8P7 + + ntpdc/ntpdc.man.in@1.333 +3 -3 + NTP_4_2_8P7 + + ntpdc/ntpdc.mdoc.in@1.333 +2 -2 + NTP_4_2_8P7 + + ntpq/invoke-ntpq.texi@1.510 +2 -2 + NTP_4_2_8P7 + + ntpq/ntpq-opts.c@1.527 +7 -7 + NTP_4_2_8P7 + + ntpq/ntpq-opts.h@1.525 +3 -3 + NTP_4_2_8P7 + + ntpq/ntpq.1ntpqman@1.338 +3 -3 + NTP_4_2_8P7 + + ntpq/ntpq.1ntpqmdoc@1.338 +2 -2 + NTP_4_2_8P7 + + ntpq/ntpq.html@1.175 +36 -6 + NTP_4_2_8P7 + + ntpq/ntpq.man.in@1.338 +3 -3 + NTP_4_2_8P7 + + ntpq/ntpq.mdoc.in@1.338 +2 -2 + NTP_4_2_8P7 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.504 +2 -2 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd-opts.c@1.522 +7 -7 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd-opts.h@1.521 +3 -3 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.333 +3 -3 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.333 +2 -2 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd.html@1.173 +1 -1 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd.man.in@1.333 +3 -3 + NTP_4_2_8P7 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.333 +2 -2 + NTP_4_2_8P7 + + packageinfo.sh@1.526 +2 -2 + NTP_4_2_8P7 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.94 +3 -3 + NTP_4_2_8P7 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.95 +2 -2 + NTP_4_2_8P7 + + scripts/calc_tickadj/calc_tickadj.html@1.96 +1 -1 + NTP_4_2_8P7 + + scripts/calc_tickadj/calc_tickadj.man.in@1.93 +3 -3 + NTP_4_2_8P7 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.95 +2 -2 + NTP_4_2_8P7 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.98 +1 -1 + NTP_4_2_8P7 + + scripts/invoke-plot_summary.texi@1.115 +2 -2 + NTP_4_2_8P7 + + scripts/invoke-summary.texi@1.115 +2 -2 + NTP_4_2_8P7 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.325 +2 -2 + NTP_4_2_8P7 + + scripts/ntp-wait/ntp-wait-opts@1.61 +2 -2 + NTP_4_2_8P7 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.322 +3 -3 + NTP_4_2_8P7 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.323 +2 -2 + NTP_4_2_8P7 + + scripts/ntp-wait/ntp-wait.html@1.342 +2 -2 + NTP_4_2_8P7 + + scripts/ntp-wait/ntp-wait.man.in@1.322 +3 -3 + NTP_4_2_8P7 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.323 +2 -2 + NTP_4_2_8P7 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.113 +2 -2 + NTP_4_2_8P7 + + scripts/ntpsweep/ntpsweep-opts@1.63 +2 -2 + NTP_4_2_8P7 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.101 +3 -3 + NTP_4_2_8P7 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.101 +2 -2 + NTP_4_2_8P7 + + scripts/ntpsweep/ntpsweep.html@1.114 +2 -2 + NTP_4_2_8P7 + + scripts/ntpsweep/ntpsweep.man.in@1.101 +3 -3 + NTP_4_2_8P7 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.102 +2 -2 + NTP_4_2_8P7 + + scripts/ntptrace/invoke-ntptrace.texi@1.114 +2 -2 + NTP_4_2_8P7 + + scripts/ntptrace/ntptrace-opts@1.63 +2 -2 + NTP_4_2_8P7 + + scripts/ntptrace/ntptrace.1ntptraceman@1.101 +3 -3 + NTP_4_2_8P7 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.102 +2 -2 + NTP_4_2_8P7 + + scripts/ntptrace/ntptrace.html@1.115 +2 -2 + NTP_4_2_8P7 + + scripts/ntptrace/ntptrace.man.in@1.101 +3 -3 + NTP_4_2_8P7 + + scripts/ntptrace/ntptrace.mdoc.in@1.103 +2 -2 + NTP_4_2_8P7 + + scripts/plot_summary-opts@1.63 +2 -2 + NTP_4_2_8P7 + + scripts/plot_summary.1plot_summaryman@1.113 +3 -3 + NTP_4_2_8P7 + + scripts/plot_summary.1plot_summarymdoc@1.113 +2 -2 + NTP_4_2_8P7 + + scripts/plot_summary.html@1.116 +2 -2 + NTP_4_2_8P7 + + scripts/plot_summary.man.in@1.113 +3 -3 + NTP_4_2_8P7 + + scripts/plot_summary.mdoc.in@1.113 +2 -2 + NTP_4_2_8P7 + + scripts/summary-opts@1.63 +2 -2 + NTP_4_2_8P7 + + scripts/summary.1summaryman@1.113 +3 -3 + NTP_4_2_8P7 + + scripts/summary.1summarymdoc@1.113 +2 -2 + NTP_4_2_8P7 + + scripts/summary.html@1.116 +2 -2 + NTP_4_2_8P7 + + scripts/summary.man.in@1.113 +3 -3 + NTP_4_2_8P7 + + scripts/summary.mdoc.in@1.113 +2 -2 + NTP_4_2_8P7 + + scripts/update-leap/invoke-update-leap.texi@1.14 +1 -1 + NTP_4_2_8P7 + + scripts/update-leap/update-leap-opts@1.14 +2 -2 + NTP_4_2_8P7 + + scripts/update-leap/update-leap.1update-leapman@1.14 +3 -3 + NTP_4_2_8P7 + + scripts/update-leap/update-leap.1update-leapmdoc@1.14 +2 -2 + NTP_4_2_8P7 + + scripts/update-leap/update-leap.html@1.14 +1 -1 + NTP_4_2_8P7 + + scripts/update-leap/update-leap.man.in@1.14 +3 -3 + NTP_4_2_8P7 + + scripts/update-leap/update-leap.mdoc.in@1.14 +2 -2 + NTP_4_2_8P7 + + sntp/invoke-sntp.texi@1.502 +2 -2 + NTP_4_2_8P7 + + sntp/sntp-opts.c@1.521 +7 -7 + NTP_4_2_8P7 + + sntp/sntp-opts.h@1.519 +3 -3 + NTP_4_2_8P7 + + sntp/sntp.1sntpman@1.337 +3 -3 + NTP_4_2_8P7 + + sntp/sntp.1sntpmdoc@1.337 +2 -2 + NTP_4_2_8P7 + + sntp/sntp.html@1.517 +2 -2 + NTP_4_2_8P7 + + sntp/sntp.man.in@1.337 +3 -3 + NTP_4_2_8P7 + + sntp/sntp.mdoc.in@1.337 +2 -2 + NTP_4_2_8P7 + + util/invoke-ntp-keygen.texi@1.505 +2 -2 + NTP_4_2_8P7 + + util/ntp-keygen-opts.c@1.523 +7 -7 + NTP_4_2_8P7 + + util/ntp-keygen-opts.h@1.521 +3 -3 + NTP_4_2_8P7 + + util/ntp-keygen.1ntp-keygenman@1.333 +3 -3 + NTP_4_2_8P7 + + util/ntp-keygen.1ntp-keygenmdoc@1.333 +2 -2 + NTP_4_2_8P7 + + util/ntp-keygen.html@1.179 +2 -2 + NTP_4_2_8P7 + + util/ntp-keygen.man.in@1.333 +3 -3 + NTP_4_2_8P7 + + util/ntp-keygen.mdoc.in@1.333 +2 -2 + NTP_4_2_8P7 + +ChangeSet@1.3668, 2016-04-26 20:07:48-04:00, stenn@deacon.udel.edu + ntp-4.2.8p7 + + packageinfo.sh@1.525 +1 -1 + ntp-4.2.8p7 + +ChangeSet@1.3667, 2016-04-26 23:24:25+00:00, stenn@psp-deb1.ntp.org + 4.2.8p7 documentation cleanup + + ChangeLog@1.1819 +9 -9 + 4.2.8p7 documentation cleanup + + NEWS@1.169 +123 -36 + 4.2.8p7 documentation cleanup + +ChangeSet@1.3666, 2016-04-24 09:17:06+00:00, stenn@psp-deb1.ntp.org + [Bug 3036] autokey trips an INSIST in authistrustedip() + + ntpd/ntp_proto.c@1.386 +0 -1 + [Bug 3036] autokey trips an INSIST in authistrustedip() + +ChangeSet@1.3665, 2016-04-21 23:42:43+00:00, stenn@psp-deb1.ntp.org + Update 3007 + + NEWS@1.168 +1 -1 + Update 3007 + +ChangeSet@1.3664, 2016-04-21 23:29:30+00:00, stenn@psp-deb1.ntp.org + [Bug 3007] Fix bug in crypto-NAK check + + ChangeLog@1.1818 +1 -1 + [Bug 3007] Fix bug in crypto-NAK check + + ntpd/ntp_proto.c@1.385 +3 -1 + [Bug 3007] Fix bug in crypto-NAK check + +ChangeSet@1.3663, 2016-04-21 09:29:31+00:00, stenn@psp-deb1.ntp.org + [Bug 3036] autokey trips an INSIST in authistrustedip() + + NEWS@1.167 +1 -0 + [Bug 3036] autokey trips an INSIST in authistrustedip() + +ChangeSet@1.3661, 2016-04-21 09:24:12+00:00, stenn@psp-deb1.ntp.org + tweak some ntp_proto.c timestamp log messages + + ntpd/ntp_proto.c@1.383 +4 -3 + tweak some ntp_proto.c timestamp log messages + +ChangeSet@1.3630.1.17, 2016-04-21 09:11:51+00:00, stenn@psp-deb1.ntp.org + [Bug 3036] autokey trips an INSIST in authistrustedip() + + ChangeLog@1.1794.1.15 +1 -0 + [Bug 3036] autokey trips an INSIST in authistrustedip() + + ntpd/ntp_proto.c@1.373.2.7 +6 -1 + [Bug 3036] autokey trips an INSIST in authistrustedip() + +ChangeSet@1.3660, 2016-04-19 05:29:57+00:00, stenn@psp-deb1.ntp.org + Windows cleanup for Bug 2978 mitigation + + ports/winnt/include/config.h@1.114 +6 -0 + Windows cleanup for Bug 2978 mitigation + +ChangeSet@1.3659, 2016-04-18 05:38:06+00:00, stenn@psp-deb1.ntp.org + 4.2.8p7 update: [Bug 2831] Segmentation Fault in DNS lookup during startup + + NEWS@1.166 +2 -0 + 4.2.8p7 update: [Bug 2831] Segmentation Fault in DNS lookup during startup + +ChangeSet@1.3630.15.1, 2016-04-18 06:07:25+02:00, perlinger@ntp.org + [Bug 2831] Segmentation Fault in DNS lookup during startup. + - fixed yet another race condition in the threaded resolver code. + + ChangeLog@1.1794.15.1 +2 -0 + [Bug 2831] Segmentation Fault in DNS lookup during startup. + - fixed yet another race condition in the threaded resolver code. + + include/ntp_worker.h@1.7 +2 -0 + [Bug 2831] Segmentation Fault in DNS lookup during startup. + - fixed yet another race condition in the threaded resolver code: global locker prototype + + libntp/ntp_intres.c@1.100 +20 -28 + [Bug 2831] Segmentation Fault in DNS lookup during startup. + - fixed yet another race condition in the threaded resolver code: + lock global context table during access + remove dangerous wrapper + + libntp/work_fork.c@1.14.1.1 +5 -0 + [Bug 2831] Segmentation Fault in DNS lookup during startup. + - fixed yet another race condition in the threaded resolver code: global locker dummy + + libntp/work_thread.c@1.21 +23 -0 + [Bug 2831] Segmentation Fault in DNS lookup during startup. + - fixed yet another race condition in the threaded resolver code: create&handle global lock + +ChangeSet@1.3657, 2016-04-16 07:59:23+00:00, stenn@psp-deb1.ntp.org + type + + NEWS@1.165 +1 -1 + type + +ChangeSet@1.3656, 2016-04-14 09:03:11+00:00, stenn@psp-deb1.ntp.org + Update the NEWS file for 4.2.8p7 + + NEWS@1.164 +7 -0 + Update the NEWS file for 4.2.8p7 + +ChangeSet@1.3655, 2016-04-14 01:59:45+00:00, stenn@psp-deb1.ntp.org + [Sec 2978] Interleave can be partially triggered + + ChangeLog@1.1815 +1 -0 + [Sec 2978] Interleave can be partially triggered + + configure.ac@1.605 +22 -0 + [Sec 2978] Interleave can be partially triggered + + ntpd/ntp_proto.c@1.382 +11 -3 + [Sec 2978] Interleave can be partially triggered + +ChangeSet@1.3654, 2016-04-14 01:46:50+00:00, stenn@psp-deb1.ntp.org + Update the NEWS file for 4.2.8p7 + + NEWS@1.163 +168 -26 + Update the NEWS file for 4.2.8p7 + +ChangeSet@1.3653, 2016-04-12 22:29:18+00:00, stenn@psp-deb1.ntp.org + 4.2.8p7 prep + + NEWS@1.162 +105 -5 + 4.2.8p7 prep + +ChangeSet@1.3652, 2016-04-12 09:01:09+00:00, stenn@psp-deb1.ntp.org + Credit Aleksandr Kostikov on bug 3019 + + ChangeLog@1.1814 +1 -0 + Credit Aleksandr Kostikov on bug 3019 + +ChangeSet@1.3630.13.6, 2016-04-12 07:43:08+00:00, stenn@psp-deb1.ntp.org + comment tweak + + ntpd/ntp_proto.c@1.373.2.6 +1 -1 + comment tweak + +ChangeSet@1.3650, 2016-04-11 20:26:29-07:00, harlan@max.pfcs.com + [Bug 2952] Symmetric active/passive mode is broken + + ChangeLog@1.1812 +1 -0 + [Bug 2952] Symmetric active/passive mode is broken + + ntpd/ntp_proto.c@1.380 +21 -12 + [Bug 2952] Symmetric active/passive mode is broken + +ChangeSet@1.3649, 2016-04-11 19:56:06-07:00, harlan@max.pfcs.com + Cleanup to include/ntp.h + + ChangeLog@1.1811 +1 -0 + Cleanup to include/ntp.h + + include/ntp.h@1.218 +7 -0 + cleanup + +ChangeSet@1.3630.13.5, 2016-04-01 19:18:25+02:00, jnperlin@nemesis.localnet + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed + - adjust pull cycle of broadcast client to trensmission of brodcast server + + libntp/ntp_worker.c@1.7.1.1 +1 -1 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed + - side kick: fix annoying signed/unsigned clash + + ntpd/ntp_proto.c@1.373.2.5 +1 -0 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed + - adjust pull cycle of broadcast client to trensmission of brodcast server + +ChangeSet@1.3630.13.4, 2016-03-30 23:55:33+02:00, jnperlin@nemesis.localnet + [Bug 3031] modify deadband + + ntpd/ntp_proto.c@1.373.2.4 +13 -12 + [Bug 3031] broadcast issues + - modify deadband for first round after volley + +ChangeSet@1.3630.14.1, 2016-03-30 17:28:04+00:00, perlinger@psp-deb1.ntp.org + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds + the cutoff limit. (default 50ms) + Retry again after the next broadcast packet. + + ChangeLog@1.1794.14.1 +5 -0 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + + ntpd/ntp_io.c@1.414.3.1 +28 -10 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + - improve/fix handling of opening broadcast sockets (-> EADDRNOTAVAIL) + + ntpd/ntp_proto.c@1.373.3.1 +23 -4 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds 50ms. + Retry again after the next broadcast packet. + - the absolute value of negative broadcastdelays is cutoff limit for peer removal. + +ChangeSet@1.3630.13.2, 2016-03-30 19:23:06+02:00, jnperlin@nemesis.localnet + [Bug 3031] + + ntpd/ntp_io.c@1.414.2.1 +28 -10 + [Bug 3031] + - improve/fix handling of opening broadcast sockets (-> EADDRNOTAVAIL) + + ntpd/ntp_proto.c@1.373.2.2 +14 -6 + [Bug 3031] + - the absolute value of negative broadcastdelays is cutoff limit for peer removal + +ChangeSet@1.3630.1.14, 2016-03-30 10:29:07+00:00, stenn@psp-deb1.ntp.org + [Bug 2960] async name resolution fixes for chroot() environments. Reinhard Max + + ChangeLog@1.1794.1.12 +2 -0 + [Bug 2960] async name resolution fixes for chroot() environments. Reinhard Max + + libntp/work_fork.c@1.15 +1 -1 + [Bug 2960] async name resolution fixes for chroot() environments. Reinhard Max + + ntpd/ntp_timer.c@1.96 +6 -0 + [Bug 2960] async name resolution fixes for chroot() environments. Reinhard Max + + ntpd/ntpd.c@1.171 +15 -0 + [Bug 2960] async name resolution fixes for chroot() environments. Reinhard Max + + sntp/m4/ntp_libntp.m4@1.33 +1 -0 + [Bug 2960] async name resolution fixes for chroot() environments. Reinhard Max + +ChangeSet@1.3630.13.1, 2016-03-29 18:22:03+02:00, perlinger@ntp.org + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds 50ms. + Retry again after the next broadcast packet. + + ChangeLog@1.1794.13.1 +5 -0 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + + ntpd/ntp_proto.c@1.373.2.1 +11 -0 + [Bug 3031] ntp broadcastclient unable to synchronize to an server when the time of server changed. + - Check the initial delay calculation and reject/unpeer the broadcast server if the delay exceeds 50ms. + Retry again after the next broadcast packet. + +ChangeSet@1.3630.12.1, 2016-03-27 23:59:51+02:00, jnperlin@nemesis.localnet + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - complete refurbishment of overlapped IO engine + - cleanup + + ChangeLog@1.1794.12.1 +2 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - work around windows network issues, improve overlapped IO. perlinger@ntp.org + + include/ntp.h@1.216.1.1 +1 -0 + [Bug 3019] NTPD stops processing packets ERROR_HOST_UNREACHABLE + - add IOCPL registration handle to interface + + include/ntp_refclock.h@1.38 +2 -1 + [Bug 3019] NTPD stops processing packets ERROR_HOST_UNREACHABLE + - add IOCPL registration handle to RIO structure + + include/recvbuff.h@1.26 +2 -2 + [Bug 3019] NTPD stops processing packets ERROR_HOST_UNREACHABLE + - fix SOCKET vs. FD clash + - 'get_free_recv_buffer_alloc()': extended comment + + libntp/ntp_worker.c@1.8 +1 -1 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - fix signed/unsigned clash + + libntp/recvbuff.c@1.41 +15 -13 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - API cleanup: accept and silently ignore NULL pointer in 'freerecvbuf()' + - fix SOCKET vs. FD clash + + ntpd/ntp_io.c@1.414.1.1 +42 -12 + [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE + - first invalidate FDs in shared structure, then close handles + - defer free() via cooling pond when doing overlapped IO + --- + [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE + - proper wiring to IO completion ports + --- + [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE + - first invalidate FDs in shared structure, then close handles + - defer free() via cooling pond when doing overlapped IO + - proper wiring to IO completion ports + --- + [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE + - wired the needed unregistration functions for overlapped IO + + ports/winnt/include/ntp_iocompletionport.h@1.22 +17 -10 + Bug 3019 - NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - extend API to provide essential information + - added missing unregistration functions to API + + ports/winnt/include/ntp_iocplmem.h@1.1 +24 -0 + [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE + - refactored IOCPL heap into separate file + + ports/winnt/include/ntp_iocplmem.h@1.0 +0 -0 + + ports/winnt/include/ntp_iocpltypes.h@1.1 +160 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - refactored helper objects (locks, PPS/device context, IO context,...) into separate file + + ports/winnt/include/ntp_iocpltypes.h@1.0 +0 -0 + + ports/winnt/ntpd/ntp_iocompletionport.c@1.73 +875 -791 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - make sure ALL operations are overlapped for sockets + - use APC queue for deferred error processing + - take extra care to deal with interfaces/clocks being removed while overlapped IO in flight + - minor WINAPI cleanups (VS2008 vs VS2013) + - extend API to provide essential information + - better context checking + - implemented the missing unregistration functions + - implemented shared locking between clocks/interfaces and IO operations + - made sure minimal locking is engaged + - fixed / locked / avoided access to global / shared values from IO thread + - made sure interfaces and clocks cannot be deleted wile accessed from worker thread + - made sure feeding the receive queue stops with deregistration + In other words, a complete refurbishment. + - further refactoring, better handling of received packets + + ports/winnt/ntpd/ntp_iocplmem.c@1.1 +123 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - refactored IOCPL heap into separate file + + ports/winnt/ntpd/ntp_iocplmem.c@1.0 +0 -0 + + ports/winnt/ntpd/ntp_iocpltypes.c@1.1 +366 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - refactored helper objects (locks, PPS/device context, IO context,...) into separate file + + ports/winnt/ntpd/ntp_iocpltypes.c@1.0 +0 -0 + + ports/winnt/ntpd/ntservice.c@1.30 +13 -3 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - log request from SCM in INFO level + + ports/winnt/vs2005/ntpd.vcproj@1.21 +8 -18 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - added ntp_iocpl{mem,types}.c to sources. + + ports/winnt/vs2008/ntpd/ntpd.vcproj@1.51 +16 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - added ntp_iocpl{mem,types}.c to sources. + + ports/winnt/vs2013/debug-x64.props@1.2 +1 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - sidekick: property sheet name + + ports/winnt/vs2013/libntp/libntp.vcxproj.filters@1.7.1.1 +3 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - auto update + + ports/winnt/vs2013/ntpd/ntpd.vcxproj@1.9 +4 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - added ntp_iocpl{mem,types}.c to sources. + + ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters@1.6 +12 -0 + [Bug 3019] NTPD stops processing packets after hitting ERROR_HOST_UNREACHABLE + - auto update + + ports/winnt/vs2013/release-x64.props@1.2 +1 -0 + [Bug 3019] NTPD stops processing packets after ERROR_HOST_UNREACHABLE + - sidekick: property sheet name + +ChangeSet@1.3630.1.12, 2016-03-19 09:09:07+00:00, stenn@psp-deb1.ntp.org + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + tests/ntpq/Makefile.am@1.9 +1 -0 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + +ChangeSet@1.3630.1.10, 2016-03-16 09:22:31+00:00, stenn@psp-deb1.ntp.org + Add README.pullrequests. Harlan Stenn + + ChangeLog@1.1794.1.9 +1 -0 + Add README.pullrequests. Harlan Stenn + + Makefile.am@1.135 +1 -0 + Add README.pullrequests. Harlan Stenn + + README.pullrequests@1.1 +90 -0 + BitKeeper file /home/stenn/ntp-stable/README.pullrequests + + README.pullrequests@1.0 +0 -0 + +ChangeSet@1.3630.11.1, 2016-03-16 08:46:16+00:00, stenn@psp-deb1.ntp.org + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ChangeLog@1.1794.11.1 +1 -0 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/invoke-ntpq.texi@1.509 +28 -1 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq-opts.c@1.526 +108 -50 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq-opts.def@1.27 +12 -0 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq-opts.h@1.524 +21 -8 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq-subs.c@1.116.1.1 +17 -10 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq.1ntpqman@1.337 +24 -3 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq.1ntpqmdoc@1.337 +22 -2 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq.c@1.169 +53 -2 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq.h@1.32 +3 -0 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq.man.in@1.337 +24 -3 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + + ntpq/ntpq.mdoc.in@1.337 +22 -2 + [Bug 3030] ntpq needs a general way to specify refid output format. HStenn. + +ChangeSet@1.3630.10.1, 2016-03-01 08:30:22+01:00, perlinger@ntp.org + [Bug 3023] ntpdate cannot correct dates in the future. + + ChangeLog@1.1794.10.1 +1 -0 + [Bug 3023] ntpdate cannot correct dates in the future. + + ntpdate/ntpdate.c@1.98 +9 -5 + [Bug 3023] ntpdate cannot correct dates in the future. + +ChangeSet@1.3642, 2016-03-01 05:46:29+00:00, stenn@psp-deb1.ntp.org + cleanup + + ChangeLog@1.1805 +0 -1 + cleanup + +ChangeSet@1.3641, 2016-02-29 23:01:01+00:00, stenn@psp-deb1.ntp.org + [Sec 3020] Refclock impersonation. HStenn. + + ChangeLog@1.1804 +1 -0 + [Sec 3020] Refclock impersonation. HStenn. + + configure.ac@1.604 +18 -0 + [Sec 3020] Refclock impersonation. HStenn. + + ntpd/ntp_io.c@1.415 +12 -0 + [Sec 3020] Refclock impersonation. HStenn. + +ChangeSet@1.3630.9.1, 2016-02-29 20:03:59+01:00, jnperlin@hydra.localnet + [Bug 3022] authkeys.c should be refactored + + ChangeLog@1.1794.9.1 +4 -0 + [Bug 3022] authkeys.c should be refactored + + include/ntp_keyacc.h@1.2 +6 -0 + [Bug 3022] authkeys.c should be refactored + - refactoring of key access handling + + libntp/authkeys.c@1.34 +146 -85 + [Bug 3022] authkeys.c should be refactored + - refactoring of key access handling + - fixed memory leak in access list + + libntp/authreadkeys.c@1.25.1.1 +52 -44 + [Bug 3022] authkeys.c should be refactored + - refactoring of key access handling + - reduced number of error branches + +ChangeSet@1.3638.2.2, 2016-02-22 05:33:56+00:00, stenn@psp-deb1.ntp.org + [Sec 3008] Always check the return value of ctl_getitem(). HStenn. + + ChangeLog@1.1801.2.1 +1 -0 + [Sec 3008] Always check the return value of ctl_getitem(). HStenn. + + ntpd/ntp_control.c@1.206.2.1 +11 -2 + [Sec 3008] Always check the return value of ctl_getitem(). HStenn. + +ChangeSet@1.3638.2.1, 2016-02-22 05:12:39+00:00, stenn@psp-deb1.ntp.org + Update ntp.conf documentation. Harlan Stenn. + + ntpd/ntp.conf.def@1.23 +38 -16 + Update ntp.conf documentation. Harlan Stenn. + +ChangeSet@1.3638.1.3, 2016-02-22 03:39:39+00:00, stenn@psp-deb1.ntp.org + Bug 3007 cleanup + + ntpd/ntp_proto.c@1.379 +4 -1 + Bug 3007 cleanup + +ChangeSet@1.3630.8.1, 2016-02-21 15:09:37+01:00, perlinger@ntp.org + [Bug 3009] Crafted addpeer with hmode > 7 causes OOB error + + ChangeLog@1.1794.8.1 +2 -0 + [Bug 3009] Crafted addpeer with hmode > 7 causes OOB error + + ntpd/ntp_request.c@1.117.2.1 +29 -2 + [Bug 3009] Crafted addpeer with hmode > 7 causes OOB error + - added more stringent checks on packet content: + hmode <= 6 (7 is already out of range for a peer mode!) + +ChangeSet@1.3630.7.2, 2016-02-21 09:39:25+01:00, perlinger@ntp.org + Bug 3010] remote configuration trustedkey/requestkey values are not properly validated + - sidekick: Ignore keys that have an unsupported MAC algorithm but are otherwise well-formed + + ChangeLog@1.1794.7.2 +2 -0 + Bug 3010] remote configuration trustedkey/requestkey values are not properly validated + - sidekick: Ignore keys that have an unsupported MAC algorithm but are otherwise well-formed + + libntp/authreadkeys.c@1.26 +48 -26 + [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated + - sidekick: Ignore keys that have an unsupported MAC algorithm but are otherwise well-formed + +ChangeSet@1.3630.7.1, 2016-02-19 22:42:25+01:00, perlinger@ntp.org + [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated + + ChangeLog@1.1794.7.1 +2 -0 + [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated + + ntpd/ntp_request.c@1.117.1.1 +41 -25 + [Bug 3010] remote configuration trustedkey/requestkey values are not properly validated + - make sure the new keyids are valid static key IDs and present in the key table + +ChangeSet@1.3630.6.1, 2016-02-19 19:47:31+01:00, perlinger@ntp.org + [Bug 3013] Fix for ssl_init.c SHA1 test + + ChangeLog@1.1794.6.1 +2 -0 + [Bug 3013] Fix for ssl_init.c SHA1 test + + tests/libntp/ssl_init.c@1.9 +2 -2 + [Bug 3013] Fix for ssl_init.c SHA1 test + - Require SHA1 explicitely, to avoid confusion with (deprecated) SHA0. + Patch provided by Ch. Weisgerber + +ChangeSet@1.3630.5.1, 2016-02-17 18:36:10+01:00, perlinger@ntp.org + [Bug 3015] ntpq: config-from-file: "request contains an unprintable character" + + ChangeLog@1.1794.5.1 +3 -0 + [Bug 3015] ntpq: config-from-file: "request contains an unprintable character" + + ntpq/ntpq-subs.c@1.117 +35 -16 + [Bug 3015] ntpq: config-from-file: "request contains an unprintable character" + - remove trailing whitespace in remote config command + - remove comments, too. + +ChangeSet@1.3639, 2016-02-17 09:30:05+01:00, jnperlin@hydra.localnet + [Bug 3008] ctl_getitem() return value not always checked + + ChangeLog@1.1802 +3 -0 + [Bug 3008] ctl_getitem() return value not always checked + + ntpd/ntp_control.c@1.206.1.1 +101 -58 + [Bug 3008] ctl_getitem() return value not always checked + - also some cleanup of ctl_getitem + +ChangeSet@1.3630.3.3, 2016-02-14 10:15:57+00:00, stenn@psp-deb1.ntp.org + Fix typo in html/monopt.html. Harlan Stenn. + + ChangeLog@1.1794.3.3 +1 -0 + Fix typo in html/monopt.html. Harlan Stenn. + + html/monopt.html@1.39 +2 -2 + Fix typo in html/monopt.html. Harlan Stenn. + +ChangeSet@1.3630.3.2, 2016-02-13 09:15:45+00:00, stenn@psp-deb1.ntp.org + Fix some Credit: attributions in the NEWS file. Harlan Stenn. + + ChangeLog@1.1794.3.2 +1 -0 + Fix some Credit: attributions in the NEWS file. Harlan Stenn. + + NEWS@1.161 +3 -2 + Fix some Credit: attributions in the NEWS file. Harlan Stenn. + +ChangeSet@1.3630.4.1, 2016-02-10 20:11:21+01:00, perlinger@ntp.org + [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch + + ChangeLog@1.1794.4.1 +2 -0 + [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch + + ntpd/ntp_request.c@1.118 +48 -78 + [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch + - reworked 'do_unconf()' to survive the effect of having peers named multiple times + +ChangeSet@1.3630.2.3, 2016-02-09 00:46:57+00:00, mayer@psp-deb1.ntp.org *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-9@freebsd.org Thu Apr 28 01:12:40 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 319E1B1E7EF; Thu, 28 Apr 2016 01:12:40 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 013811EE3; Thu, 28 Apr 2016 01:12:39 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3S1CdAl015588; Thu, 28 Apr 2016 01:12:39 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3S1CdH2015587; Thu, 28 Apr 2016 01:12:39 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604280112.u3S1CdH2015587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 28 Apr 2016 01:12:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298727 - stable/9/lib/libc/regex X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 01:12:40 -0000 Author: pfg Date: Thu Apr 28 01:12:38 2016 New Revision: 298727 URL: https://svnweb.freebsd.org/changeset/base/298727 Log: MFC r298521; regex: prevent two improbable signed integer overflows. In matcher() we used an integer to index nsub of type size_t. In print() we used an integer to index nstates of type sopno, typedef'd long. In both cases the indexes never take negative values. Match the types to avoid any error. Modified: stable/9/lib/libc/regex/engine.c Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/regex/engine.c ============================================================================== --- stable/9/lib/libc/regex/engine.c Thu Apr 28 01:11:25 2016 (r298726) +++ stable/9/lib/libc/regex/engine.c Thu Apr 28 01:12:38 2016 (r298727) @@ -154,7 +154,7 @@ matcher(struct re_guts *g, int eflags) { const char *endp; - int i; + size_t i; struct match mv; struct match *m = &mv; const char *dp; @@ -1108,7 +1108,7 @@ print(struct match *m, FILE *d) { struct re_guts *g = m->g; - int i; + sopno i; int first = 1; if (!(m->eflags®_TRACE)) From owner-svn-src-stable-9@freebsd.org Fri Apr 29 03:06:43 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D8BDB2098D; Fri, 29 Apr 2016 03:06:43 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FC8C164B; Fri, 29 Apr 2016 03:06:43 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3T36gce091460; Fri, 29 Apr 2016 03:06:42 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3T36gHR091459; Fri, 29 Apr 2016 03:06:42 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604290306.u3T36gHR091459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 29 Apr 2016 03:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298765 - stable/9/sbin/fsck_ffs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 03:06:43 -0000 Author: pfg Date: Fri Apr 29 03:06:42 2016 New Revision: 298765 URL: https://svnweb.freebsd.org/changeset/base/298765 Log: MFC r298551, r298679, r298680: fsck_ffs: use uint32_t for closedisk(). fs_ncg is of type uint32_t, and we were indexing it with an int. Fixed this using an unsigned type. Reviewed by: mckusick Modified: stable/9/sbin/fsck_ffs/suj.c Directory Properties: stable/9/sbin/fsck_ffs/ (props changed) Modified: stable/9/sbin/fsck_ffs/suj.c ============================================================================== --- stable/9/sbin/fsck_ffs/suj.c Fri Apr 29 03:04:56 2016 (r298764) +++ stable/9/sbin/fsck_ffs/suj.c Fri Apr 29 03:06:42 2016 (r298765) @@ -216,7 +216,7 @@ static void closedisk(const char *devnam) { struct csum *cgsum; - int i; + uint32_t i; /* * Recompute the fs summary info from correct cs summaries. From owner-svn-src-stable-9@freebsd.org Fri Apr 29 03:13:19 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFBE5B20BF5; Fri, 29 Apr 2016 03:13:19 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1C361CA7; Fri, 29 Apr 2016 03:13:19 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3T3DISo094491; Fri, 29 Apr 2016 03:13:18 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3T3DI6G094490; Fri, 29 Apr 2016 03:13:18 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604290313.u3T3DI6G094490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 29 Apr 2016 03:13:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298767 - stable/9/bin/ed X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 03:13:20 -0000 Author: pfg Date: Fri Apr 29 03:13:18 2016 New Revision: 298767 URL: https://svnweb.freebsd.org/changeset/base/298767 Log: MFC r298640: ed(1): switch two statements so we check the index before dereferencing. Modified: stable/9/bin/ed/cbc.c Directory Properties: stable/9/bin/ed/ (props changed) Modified: stable/9/bin/ed/cbc.c ============================================================================== --- stable/9/bin/ed/cbc.c Fri Apr 29 03:12:14 2016 (r298766) +++ stable/9/bin/ed/cbc.c Fri Apr 29 03:13:18 2016 (r298767) @@ -263,7 +263,7 @@ expand_des_key(char *obuf, char *kbuf) /* * now translate it, bombing on any illegal binary digit */ - for (i = 0; kbuf[i] && i < 16; i++) + for (i = 0; i < 16 && kbuf[i]; i++) if ((nbuf[i] = hex_to_binary((int) kbuf[i], 2)) == -1) des_error("bad binary digit in key"); while (i < 64) From owner-svn-src-stable-9@freebsd.org Fri Apr 29 11:10:44 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AAC1AB208B4; Fri, 29 Apr 2016 11:10:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6156A1FEC; Fri, 29 Apr 2016 11:10:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TBAhVa037131; Fri, 29 Apr 2016 11:10:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TBAhLH037130; Fri, 29 Apr 2016 11:10:43 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201604291110.u3TBAhLH037130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 29 Apr 2016 11:10:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298774 - stable/9/sys/ofed/drivers/net/mlx4 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 11:10:44 -0000 Author: hselasky Date: Fri Apr 29 11:10:43 2016 New Revision: 298774 URL: https://svnweb.freebsd.org/changeset/base/298774 Log: MFC r297966: Add missing port_up checks. When downing a mlxen network adapter we need to check the port_up variable to ensure we don't continue to transmit data or restart timers which can reside in freed memory. Sponsored by: Mellanox Technologies Modified: stable/9/sys/ofed/drivers/net/mlx4/en_tx.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ofed/drivers/net/mlx4/en_tx.c ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/en_tx.c Fri Apr 29 11:06:24 2016 (r298773) +++ stable/9/sys/ofed/drivers/net/mlx4/en_tx.c Fri Apr 29 11:10:43 2016 (r298774) @@ -458,7 +458,7 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq) struct mlx4_en_priv *priv = netdev_priv(cq->dev); struct mlx4_en_tx_ring *ring = priv->tx_ring[cq->ring]; - if (!spin_trylock(&ring->comp_lock)) + if (priv->port_up == 0 || !spin_trylock(&ring->comp_lock)) return; mlx4_en_process_tx_cq(cq->dev, cq); mod_timer(&cq->timer, jiffies + 1); @@ -474,6 +474,8 @@ void mlx4_en_poll_tx_cq(unsigned long da INC_PERF_COUNTER(priv->pstats.tx_poll); + if (priv->port_up == 0) + return; if (!spin_trylock(&ring->comp_lock)) { mod_timer(&cq->timer, jiffies + MLX4_EN_TX_POLL_TIMEOUT); return; @@ -495,6 +497,9 @@ static inline void mlx4_en_xmit_poll(str struct mlx4_en_cq *cq = priv->tx_cq[tx_ind]; struct mlx4_en_tx_ring *ring = priv->tx_ring[tx_ind]; + if (priv->port_up == 0) + return; + /* If we don't have a pending timer, set one up to catch our recent post in case the interface becomes idle */ if (!timer_pending(&cq->timer)) @@ -1042,7 +1047,9 @@ mlx4_en_tx_que(void *context, int pendin priv = dev->if_softc; tx_ind = cq->ring; ring = priv->tx_ring[tx_ind]; - if (dev->if_drv_flags & IFF_DRV_RUNNING) { + + if (priv->port_up != 0 && + (dev->if_drv_flags & IFF_DRV_RUNNING) != 0) { mlx4_en_xmit_poll(priv, tx_ind); spin_lock(&ring->tx_lock); if (!drbr_empty(dev, ring->br)) @@ -1059,6 +1066,11 @@ mlx4_en_transmit(struct ifnet *dev, stru struct mlx4_en_cq *cq; int i, err = 0; + if (priv->port_up == 0) { + m_freem(m); + return (ENETDOWN); + } + /* Compute which queue to use */ if (m->m_flags & M_FLOWID) { i = (m->m_pkthdr.flowid % 128) % priv->tx_ring_num; @@ -1092,6 +1104,9 @@ mlx4_en_qflush(struct ifnet *dev) struct mlx4_en_tx_ring *ring; struct mbuf *m; + if (priv->port_up == 0) + return; + for (int i = 0; i < priv->tx_ring_num; i++) { ring = priv->tx_ring[i]; spin_lock(&ring->tx_lock); From owner-svn-src-stable-9@freebsd.org Fri Apr 29 11:15:50 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 142ABB20B3F; Fri, 29 Apr 2016 11:15:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C67F61658; Fri, 29 Apr 2016 11:15:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TBFnC0040183; Fri, 29 Apr 2016 11:15:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TBFmO1040181; Fri, 29 Apr 2016 11:15:48 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201604291115.u3TBFmO1040181@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 29 Apr 2016 11:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298776 - stable/9/sys/ofed/drivers/net/mlx4 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 11:15:50 -0000 Author: hselasky Date: Fri Apr 29 11:15:48 2016 New Revision: 298776 URL: https://svnweb.freebsd.org/changeset/base/298776 Log: MFC r297967: Ensure the received IP header gets 32-bits aligned. The FreeBSD's TCP/IP stack assumes that the IP-header is 32-bits aligned when decoding it. Else unaligned 32-bit memory access can happen, which not all processor architectures support. Sponsored by: Mellanox Technologies Modified: stable/9/sys/ofed/drivers/net/mlx4/en_rx.c stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ofed/drivers/net/mlx4/en_rx.c ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/en_rx.c Fri Apr 29 11:14:02 2016 (r298775) +++ stable/9/sys/ofed/drivers/net/mlx4/en_rx.c Fri Apr 29 11:15:48 2016 (r298776) @@ -55,7 +55,7 @@ static void mlx4_en_init_rx_desc(struct int i; /* Set size and memtype fields */ - rx_desc->data[0].byte_count = cpu_to_be32(priv->rx_mb_size); + rx_desc->data[0].byte_count = cpu_to_be32(priv->rx_mb_size - MLX4_NET_IP_ALIGN); rx_desc->data[0].lkey = cpu_to_be32(priv->mdev->mr.key); /* @@ -87,7 +87,10 @@ mlx4_en_alloc_buf(struct mlx4_en_rx_ring if (unlikely(mb == NULL)) return (-ENOMEM); /* setup correct length */ - mb->m_len = ring->rx_mb_size; + mb->m_pkthdr.len = mb->m_len = ring->rx_mb_size; + + /* make sure IP header gets aligned */ + m_adj(mb, MLX4_NET_IP_ALIGN); /* load spare mbuf into BUSDMA */ err = -bus_dmamap_load_mbuf_sg(ring->dma_tag, ring->spare.dma_map, @@ -117,7 +120,10 @@ mlx4_en_alloc_buf(struct mlx4_en_rx_ring goto use_spare; /* setup correct length */ - mb->m_len = ring->rx_mb_size; + mb->m_pkthdr.len = mb->m_len = ring->rx_mb_size; + + /* make sure IP header gets aligned */ + m_adj(mb, MLX4_NET_IP_ALIGN); err = -bus_dmamap_load_mbuf_sg(ring->dma_tag, mb_list->dma_map, mb, segs, &nsegs, BUS_DMA_NOWAIT); @@ -249,7 +255,8 @@ static void mlx4_en_free_rx_buf(struct m void mlx4_en_calc_rx_buf(struct net_device *dev) { struct mlx4_en_priv *priv = netdev_priv(dev); - int eff_mtu = dev->if_mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN; + int eff_mtu = dev->if_mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN + + MLX4_NET_IP_ALIGN; if (eff_mtu > MJUM16BYTES) { en_err(priv, "MTU(%d) is too big\n", (int)dev->if_mtu); Modified: stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h Fri Apr 29 11:14:02 2016 (r298775) +++ stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h Fri Apr 29 11:15:48 2016 (r298776) @@ -69,6 +69,7 @@ #define MLX4_EN_PAGE_SHIFT 12 #define MLX4_EN_PAGE_SIZE (1 << MLX4_EN_PAGE_SHIFT) +#define MLX4_NET_IP_ALIGN 2 /* bytes */ #define DEF_RX_RINGS 16 #define MAX_RX_RINGS 128 #define MIN_RX_RINGS 4 From owner-svn-src-stable-9@freebsd.org Fri Apr 29 11:17:27 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56E9CB20C76; Fri, 29 Apr 2016 11:17:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0DDAE1959; Fri, 29 Apr 2016 11:17:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TBHQsW040294; Fri, 29 Apr 2016 11:17:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TBHQs2040291; Fri, 29 Apr 2016 11:17:26 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201604291117.u3TBHQs2040291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 29 Apr 2016 11:17:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298777 - stable/9/sys/ofed/drivers/net/mlx4 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 11:17:27 -0000 Author: hselasky Date: Fri Apr 29 11:17:25 2016 New Revision: 298777 URL: https://svnweb.freebsd.org/changeset/base/298777 Log: MFC r297968: Remove some unused fields. Sponsored by: Mellanox Technologies Modified: stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c stable/9/sys/ofed/drivers/net/mlx4/en_rx.c stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c Fri Apr 29 11:15:48 2016 (r298776) +++ stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c Fri Apr 29 11:17:25 2016 (r298777) @@ -1244,10 +1244,6 @@ int mlx4_en_start_port(struct net_device /* Calculate Rx buf size */ dev->if_mtu = min(dev->if_mtu, priv->max_mtu); mlx4_en_calc_rx_buf(dev); - priv->rx_alloc_size = max_t(int, 2 * roundup_pow_of_two(priv->rx_mb_size), - PAGE_SIZE); - priv->rx_alloc_order = get_order(priv->rx_alloc_size); - priv->rx_buf_size = roundup_pow_of_two(priv->rx_mb_size); en_dbg(DRV, priv, "Rx buf size:%d\n", priv->rx_mb_size); /* Configure rx cq's and rings */ Modified: stable/9/sys/ofed/drivers/net/mlx4/en_rx.c ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/en_rx.c Fri Apr 29 11:15:48 2016 (r298776) +++ stable/9/sys/ofed/drivers/net/mlx4/en_rx.c Fri Apr 29 11:17:25 2016 (r298777) @@ -391,9 +391,6 @@ int mlx4_en_activate_rx_rings(struct mlx ring->cons = 0; ring->actual_size = 0; ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn; - ring->rx_alloc_order = priv->rx_alloc_order; - ring->rx_alloc_size = priv->rx_alloc_size; - ring->rx_buf_size = priv->rx_buf_size; ring->rx_mb_size = priv->rx_mb_size; ring->stride = stride; Modified: stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h Fri Apr 29 11:15:48 2016 (r298776) +++ stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h Fri Apr 29 11:17:25 2016 (r298777) @@ -316,9 +316,6 @@ struct mlx4_en_rx_ring { u32 cons; u32 buf_size; u8 fcs_del; - u16 rx_alloc_order; - u32 rx_alloc_size; - u32 rx_buf_size; u32 rx_mb_size; int qpn; u8 *buf; @@ -557,9 +554,6 @@ struct mlx4_en_priv { u32 tx_ring_num; u32 rx_ring_num; u32 rx_mb_size; - u16 rx_alloc_order; - u32 rx_alloc_size; - u32 rx_buf_size; struct mlx4_en_tx_ring **tx_ring; struct mlx4_en_rx_ring *rx_ring[MAX_RX_RINGS]; From owner-svn-src-stable-9@freebsd.org Fri Apr 29 11:31:29 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2320CB2031B; Fri, 29 Apr 2016 11:31:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E8BEE177C; Fri, 29 Apr 2016 11:31:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TBVSRb046124; Fri, 29 Apr 2016 11:31:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TBVSud046123; Fri, 29 Apr 2016 11:31:28 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201604291131.u3TBVSud046123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 29 Apr 2016 11:31:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298780 - stable/9/sys/ofed/drivers/infiniband/ulp/ipoib X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 11:31:29 -0000 Author: hselasky Date: Fri Apr 29 11:31:27 2016 New Revision: 298780 URL: https://svnweb.freebsd.org/changeset/base/298780 Log: MFC r298458: Add missing set of the current VNET when inputting IP packets in IPoIB. This fixes a kernel panic when using IPoIB with VIMAGE and infiniband. PR: 208957 Sponsored by: Mellanox Technologies Tested by: Justin Clift Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c ============================================================================== --- stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c Fri Apr 29 11:29:52 2016 (r298779) +++ stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c Fri Apr 29 11:31:27 2016 (r298780) @@ -481,6 +481,8 @@ void ipoib_cm_handle_rx_wc(struct ipoib_ int has_srq; u_short proto; + CURVNET_SET_QUIET(dev->if_vnet); + ipoib_dbg_data(priv, "cm recv completion: id %d, status: %d\n", wr_id, wc->status); @@ -496,7 +498,7 @@ void ipoib_cm_handle_rx_wc(struct ipoib_ } else ipoib_warn(priv, "cm recv completion event with wrid %d (> %d)\n", wr_id, ipoib_recvq_size); - return; + goto done; } p = wc->qp->qp_context; @@ -520,7 +522,7 @@ void ipoib_cm_handle_rx_wc(struct ipoib_ queue_work(ipoib_workqueue, &priv->cm.rx_reap_task); spin_unlock(&priv->lock); } - return; + goto done; } } @@ -579,6 +581,9 @@ repost: "for buf %d\n", wr_id); } } +done: + CURVNET_RESTORE(); + return; } static inline int post_send(struct ipoib_dev_priv *priv, From owner-svn-src-stable-9@freebsd.org Fri Apr 29 11:38:47 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F14AB20582; Fri, 29 Apr 2016 11:38:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1456D1CCF; Fri, 29 Apr 2016 11:38:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TBckJp046516; Fri, 29 Apr 2016 11:38:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TBckmI046513; Fri, 29 Apr 2016 11:38:46 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201604291138.u3TBckmI046513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 29 Apr 2016 11:38:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298782 - in stable/9/sys/dev/usb: . quirk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 11:38:47 -0000 Author: hselasky Date: Fri Apr 29 11:38:45 2016 New Revision: 298782 URL: https://svnweb.freebsd.org/changeset/base/298782 Log: MFC r297696 and r298424: Add new USB quirks. Submitted by: AJ PR: 208623 Submitted by: Naram Qashat PR: 208642 Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- stable/9/sys/dev/usb/quirk/usb_quirk.c Fri Apr 29 11:37:06 2016 (r298781) +++ stable/9/sys/dev/usb/quirk/usb_quirk.c Fri Apr 29 11:38:45 2016 (r298782) @@ -135,6 +135,8 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(CORSAIR, K60, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), /* Quirk for Corsair Vengeance K70 keyboard */ USB_QUIRK(CORSAIR, K70, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), + /* Quirk for Corsair STRAFE Gaming keyboard */ + USB_QUIRK(CORSAIR, STRAFE, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), /* umodem(4) device quirks */ USB_QUIRK(METRICOM, RICOCHET_GS, 0x100, 0x100, UQ_ASSUME_CM_OVER_DATA), USB_QUIRK(SANYO, SCP4900, 0x000, 0x000, UQ_ASSUME_CM_OVER_DATA), @@ -528,6 +530,9 @@ static struct usb_quirk_entry usb_quirks /* DYMO LabelManager Pnp */ USB_QUIRK(DYMO, LABELMANAGERPNP, 0x0000, 0xffff, UQ_MSC_DYMO_EJECT), + + /* Holtek USB gaming keyboard */ + USB_QUIRK(HOLTEK, F85, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), }; #undef USB_QUIRK_VP #undef USB_QUIRK Modified: stable/9/sys/dev/usb/usbdevs ============================================================================== --- stable/9/sys/dev/usb/usbdevs Fri Apr 29 11:37:06 2016 (r298781) +++ stable/9/sys/dev/usb/usbdevs Fri Apr 29 11:38:45 2016 (r298782) @@ -1509,6 +1509,7 @@ product COREGA FETHER_USB_TXC 0x9601 FEt /* Corsair products */ product CORSAIR K60 0x0a60 Corsair Vengeance K60 keyboard product CORSAIR K70 0x1b09 Corsair Vengeance K70 keyboard +product CORSAIR STRAFE 0x1b15 Cossair STRAFE Gaming keyboard /* Creative products */ product CREATIVE NOMAD_II 0x1002 Nomad II MP3 player @@ -2266,6 +2267,9 @@ product HIDGLOBAL CM6020 0x1784 Omnikey product HITACHI DVDCAM_DZ_MV100A 0x0004 DVD-CAM DZ-MV100A Camcorder product HITACHI DVDCAM_USB 0x001e DVDCAM USB HS Interface +/* Holtek products */ +product HOLTEK F85 0xa030 Holtek USB gaming keyboard + /* HP products */ product HP 895C 0x0004 DeskJet 895C product HP 4100C 0x0101 Scanjet 4100C From owner-svn-src-stable-9@freebsd.org Sat Apr 30 09:43:02 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE1B1AD90EC; Sat, 30 Apr 2016 09:43:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF16C19AD; Sat, 30 Apr 2016 09:43:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3U9h1JA060637; Sat, 30 Apr 2016 09:43:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3U9h1DQ060636; Sat, 30 Apr 2016 09:43:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201604300943.u3U9h1DQ060636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 30 Apr 2016 09:43:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r298843 - stable/9/sbin/ping6 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2016 09:43:03 -0000 Author: ngie Date: Sat Apr 30 09:43:01 2016 New Revision: 298843 URL: https://svnweb.freebsd.org/changeset/base/298843 Log: MFstable/10 r272871: r272871 (by hrs): MFC r271909: Revert changes in r269180. It could cause -c N option to enter an infinite loop if no reply packet is received. Modified: stable/9/sbin/ping6/ping6.c Directory Properties: stable/9/ (props changed) stable/9/sbin/ (props changed) stable/9/sbin/ping6/ (props changed) Modified: stable/9/sbin/ping6/ping6.c ============================================================================== --- stable/9/sbin/ping6/ping6.c Sat Apr 30 09:32:19 2016 (r298842) +++ stable/9/sbin/ping6/ping6.c Sat Apr 30 09:43:01 2016 (r298843) @@ -1088,14 +1088,8 @@ main(int argc, char *argv[]) /* signal handling */ if (seenalrm) { /* last packet sent, timeout reached? */ - if (npackets && ntransmitted >= npackets) { - struct timeval zerotime = {0, 0}; - itimer.it_value = zerotime; - itimer.it_interval = zerotime; - (void)setitimer(ITIMER_REAL, &itimer, NULL); - seenalrm = 0; /* clear flag */ - continue; - } + if (npackets && ntransmitted >= npackets) + break; retransmit(); seenalrm = 0; continue;