financiers
give an
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Mar 27 07:54:43 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
bzero - memset
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.3 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.4
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.3 Fri Sep 6 05:50:22 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Thu Mar 27 07:54:43 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.3 2013/09/06 05:50:22 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.4 2014/03/27 07:54:43 skrll Exp $
*/
#include sys/types.h
@@ -252,7 +252,7 @@ void sema_sysinit(void *arg)
void
_sema_init(struct semaphore *s, int value)
{
- bzero(s, sizeof(*s));
+ memset(s, 0, sizeof(*s));
mutex_init(s-mtx, MUTEX_DEFAULT, IPL_VM);
cv_init(s-cv, semacv);
s-value = value;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Mar 27 07:56:56 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.4 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.5
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.4 Thu Mar 27 07:54:43 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Thu Mar 27 07:56:56 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.4 2014/03/27 07:54:43 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.5 2014/03/27 07:56:56 skrll Exp $
*/
#include sys/types.h
@@ -296,14 +296,14 @@ down_interruptible(struct semaphore *s)
if (ret == EINTR || ret == ERESTART) {
mutex_exit(s-mtx);
- return (-EINTR);
+ return -EINTR;
}
}
s-value--;
mutex_exit(s-mtx);
- return (0);
+ return 0;
}
int
@@ -325,7 +325,7 @@ down_trylock(struct semaphore *s)
mutex_exit(s-mtx);
- return (ret);
+ return ret;
}
void
@@ -385,7 +385,7 @@ int
fatal_signal_pending(VCHIQ_THREAD_T thr)
{
printf(Implement ME: %s\n, __func__);
- return (0);
+ return 0;
}
/*
@@ -426,7 +426,7 @@ vchiq_thread_create(int (*threadfn)(void
if (thread_data_slot = MAX_THREAD_DATA_SLOTS) {
printf(kthread_create: out of thread data slots\n);
- return (NULL);
+ return NULL;
}
slot = thread_slots[thread_data_slot];
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Mar 27 07:59:17 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
Simplify the semaphore code a little
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.5 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.6
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.5 Thu Mar 27 07:56:56 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Thu Mar 27 07:59:17 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.5 2014/03/27 07:56:56 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.6 2014/03/27 07:59:17 skrll Exp $
*/
#include sys/types.h
@@ -283,15 +283,12 @@ down(struct semaphore *s)
int
down_interruptible(struct semaphore *s)
{
- int ret ;
-
- ret = 0;
mutex_enter(s-mtx);
while (s-value == 0) {
s-waiters++;
- ret = cv_wait_sig(s-cv, s-mtx);
+ int ret = cv_wait_sig(s-cv, s-mtx);
s-waiters--;
if (ret == EINTR || ret == ERESTART) {
@@ -309,9 +306,7 @@ down_interruptible(struct semaphore *s)
int
down_trylock(struct semaphore *s)
{
- int ret;
-
- ret = 0;
+ int ret = 1;
mutex_enter(s-mtx);
@@ -319,8 +314,6 @@ down_trylock(struct semaphore *s)
/* Success. */
s-value--;
ret = 0;
- } else {
- ret = -EAGAIN;
}
mutex_exit(s-mtx);
@@ -333,7 +326,7 @@ up(struct semaphore *s)
{
mutex_enter(s-mtx);
s-value++;
- if (s-waiters s-value 0)
+ if (s-value 0 s-waiters)
cv_signal(s-cv);
mutex_exit(s-mtx);
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src
Committed By: skrll
Date: Thu Mar 27 10:11:04 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_2835_arm.c
Log Message:
Remove #if 0'ed code.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.10 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.11
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.10 Wed Mar 26 16:07:15 2014
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c Thu Mar 27 10:11:04 2014
@@ -251,6 +251,13 @@ typedef struct bulkinfo_struct {
int size;
} BULKINFO_T;
+/* There is a potential problem with partial cache lines (pages?)
+** at the ends of the block when reading. If the CPU accessed anything in
+** the same line (page?) then it may have pulled old data into the cache,
+** obscuring the new data underneath. We can solve this by transferring the
+** partial cache lines separately, and allowing the ARM to copy into the
+** cached area.
+*/
VCHIQ_STATUS_T
vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle,
void *buf, int size, int dir)
@@ -554,195 +561,3 @@ vchiq_platform_handle_timeout(VCHIQ_STAT
{
(void)state;
}
-/*
- * Local functions
- */
-
-/* There is a potential problem with partial cache lines (pages?)
-** at the ends of the block when reading. If the CPU accessed anything in
-** the same line (page?) then it may have pulled old data into the cache,
-** obscuring the new data underneath. We can solve this by transferring the
-** partial cache lines separately, and allowing the ARM to copy into the
-** cached area.
-
-** N.B. This implementation plays slightly fast and loose with the Linux
-** driver programming rules, e.g. its use of __virt_to_bus instead of
-** dma_map_single, but it isn't a multi-platform driver and it benefits
-** from increased speed as a result.
-*/
-
-#if 0
-static int
-create_pagelist(char __user *buf, size_t count, unsigned short type,
- struct task_struct *task, PAGELIST_T ** ppagelist)
-{
- PAGELIST_T *pagelist;
- struct page **pages;
- struct page *page;
- unsigned long *addrs;
- unsigned int num_pages, offset, i;
- char *addr, *base_addr, *next_addr;
- int run, addridx, actual_pages;
-
- offset = (unsigned int)buf (PAGE_SIZE - 1);
- num_pages = (count + offset + PAGE_SIZE - 1) / PAGE_SIZE;
-
- *ppagelist = NULL;
-
- /* Allocate enough storage to hold the page pointers and the page
- ** list
- */
- pagelist = kmalloc(sizeof(PAGELIST_T) +
- (num_pages * sizeof(unsigned long)) +
- (num_pages * sizeof(pages[0])),
- GFP_KERNEL);
-
- vchiq_log_trace(vchiq_arm_log_level,
- create_pagelist - %x, (unsigned int)pagelist);
- if (!pagelist)
- return -ENOMEM;
-
- addrs = pagelist-addrs;
- pages = (struct page **)(addrs + num_pages);
-
- down_read(task-mm-mmap_sem);
- actual_pages = get_user_pages(task, task-mm,
- (unsigned long)buf ~(PAGE_SIZE - 1), num_pages,
- (type == PAGELIST_READ) /*Write */ , 0 /*Force */ ,
- pages, NULL /*vmas */);
- up_read(task-mm-mmap_sem);
-
- if (actual_pages != num_pages)
- {
- /* This is probably due to the process being killed */
- while (actual_pages 0)
- {
- actual_pages--;
- page_cache_release(pages[actual_pages]);
- }
- kfree(pagelist);
- if (actual_pages == 0)
- actual_pages = -ENOMEM;
- return actual_pages;
- }
-
- pagelist-length = count;
- pagelist-type = type;
- pagelist-offset = offset;
-
- /* Group the pages into runs of contiguous pages */
-
- base_addr = VCHIQ_ARM_ADDRESS(page_address(pages[0]));
- next_addr = base_addr + PAGE_SIZE;
- addridx = 0;
- run = 0;
-
- for (i = 1; i num_pages; i++) {
- addr = VCHIQ_ARM_ADDRESS(page_address(pages[i]));
- if ((addr == next_addr) (run (PAGE_SIZE - 1))) {
- next_addr += PAGE_SIZE;
- run++;
- } else {
- addrs[addridx] = (unsigned long)base_addr + run;
- addridx++;
- base_addr = addr;
- next_addr = addr + PAGE_SIZE;
- run = 0;
- }
- }
-
- addrs[addridx] = (unsigned long)base_addr + run;
- addridx++;
-
- /* Partial cache lines (fragments) require special measures */
- if ((type == PAGELIST_READ)
- ((pagelist-offset (CACHE_LINE_SIZE - 1)) ||
- ((pagelist-offset + pagelist-length)
- (CACHE_LINE_SIZE - 1 {
- FRAGMENTS_T *fragments;
-
- if (down_interruptible(g_free_fragments_sema) != 0) {
- kfree(pagelist);
- return -EINTR;
- }
-
- WARN_ON(g_free_fragments == NULL);
-
- down(g_free_fragments_mutex);
- fragments = (FRAGMENTS_T *) g_free_fragments;
- WARN_ON(fragments == NULL);
- g_free_fragments = *(FRAGMENTS_T **) g_free_fragments;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src
Committed By: skrll
Date: Thu Mar 27 10:42:47 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_2835_arm.c
Log Message:
More #if 0'ed removal
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.11 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.12
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c:1.11 Thu Mar 27 10:11:04 2014
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c Thu Mar 27 10:42:47 2014
@@ -72,15 +72,6 @@ struct semaphore g_free_fragments_sema;
static DEFINE_SEMAPHORE(g_free_fragments_mutex);
-#if 0
-static int
-create_pagelist(char __user *buf, size_t count, unsigned short type,
-lwp_t *l, PAGELIST_T ** ppagelist);
-
-static void
-free_pagelist(PAGELIST_T *pagelist, int actual);
-#endif
-
int __init
vchiq_platform_init(VCHIQ_STATE_T *state)
{
CVS commit: src/external/cddl/osnet/dist
Module Name:src
Committed By: christos
Date: Thu Mar 27 15:50:48 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c
src/external/cddl/osnet/dist/cmd/zdb: zdb.c
src/external/cddl/osnet/dist/cmd/ztest: ztest.c
src/external/cddl/osnet/dist/lib/libdtrace/arm: dt_isadep.c
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_handle.c
dt_link.c dt_subr.c
src/external/cddl/osnet/dist/lib/libzpool/common: util.c
src/external/cddl/osnet/dist/tools/ctf/cvt: merge.c
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c fasttrap.c
src/external/cddl/osnet/dist/uts/common/fs/zfs: ddt.c spa.c
zfs_vfsops.c zfs_znode.c zio.c zvol.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: ddt.h
src/external/cddl/osnet/dist/uts/common/sys: cmn_err.h
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb.c
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/cmd/ztest/ztest.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/lib/libzpool/common/util.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c
cvs rdiff -u -r1.26 -r1.27 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/dtrace/fasttrap.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/ddt.c
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
cvs rdiff -u -r1.15 -r1.16 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zio.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/ddt.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/sys/cmn_err.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.2 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.3
--- src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.2 Sat Feb 20 19:49:54 2010
+++ src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c Thu Mar 27 11:50:48 2014
@@ -953,7 +953,7 @@ bufhandler(const dtrace_bufdata_t *bufda
uint8_t *data;
int lim = rec-dtrd_size;
- (void) sprintf(buf, %d (data: , rec-dtrd_offset);
+ (void) snprintf(buf, end, %d (data: , rec-dtrd_offset);
c = buf + strlen(buf);
if (lim sizeof (uint64_t))
Index: src/external/cddl/osnet/dist/cmd/zdb/zdb.c
diff -u src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.1.1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.2
--- src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.1.1.2 Sat Feb 27 17:29:30 2010
+++ src/external/cddl/osnet/dist/cmd/zdb/zdb.c Thu Mar 27 11:50:48 2014
@@ -572,7 +572,7 @@ dump_dde(const ddt_t *ddt, const ddt_ent
if (ddp-ddp_phys_birth == 0)
continue;
ddt_bp_create(ddt-ddt_checksum, ddk, ddp, blk);
- sprintf_blkptr(blkbuf, blk);
+ snprintf_blkptr(blkbuf, sizeof(blkbuf), blk);
(void) printf(index %llx refcnt %llu %s %s\n,
(u_longlong_t)index, (u_longlong_t)ddp-ddp_refcnt,
types[p], blkbuf);
@@ -822,25 +822,30 @@ blkid2offset(const dnode_phys_t *dnp, co
}
static void
-sprintf_blkptr_compact(char *blkbuf, blkptr_t *bp)
+snprintf_blkptr_compact(char *blkbuf, size_t blklen, blkptr_t *bp)
{
dva_t *dva = bp-blk_dva;
int ndvas = dump_opt['d'] 5 ? BP_GET_NDVAS(bp) : 1;
+ size_t len;
if (dump_opt['b'] = 5) {
- sprintf_blkptr(blkbuf, bp);
+ snprintf_blkptr(blkbuf, blklen, bp);
return;
}
blkbuf[0] = '\0';
- for (int i = 0; i ndvas; i++)
- (void) sprintf(blkbuf + strlen(blkbuf), %llu:%llx:%llx ,
+ len = 0;
+ for (int i = 0; i ndvas; i++) {
+ len += snprintf(blkbuf + len, blklen - len, %llu:%llx:%llx ,
(u_longlong_t)DVA_GET_VDEV(dva[i]),
(u_longlong_t)DVA_GET_OFFSET(dva[i]),
(u_longlong_t)DVA_GET_ASIZE(dva[i]));
+ if (len blklen)
+ len = blklen;
+ }
- (void) sprintf(blkbuf + strlen(blkbuf),
+ snprintf(blkbuf + len, blklen - len,
%llxL/%llxP F=%llu B=%llu/%llu,
(u_longlong_t)BP_GET_LSIZE(bp),
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src
Committed By: apb
Date: Thu Mar 27 16:10:46 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: engine.c md2.c
src/crypto/external/bsd/heimdal/dist/lib/kadm5: ad.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: test_pknistkdf.c
Log Message:
Fix sizeof errors in memset calls in heimdal.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.1.1.1 Wed Apr 13 18:14:49 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c Thu Mar 27 16:10:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: engine.c,v 1.1.1.1 2011/04/13 18:14:49 elric Exp $ */
+/* $NetBSD: engine.c,v 1.2 2014/03/27 16:10:45 apb Exp $ */
/*
* Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -90,7 +90,7 @@ ENGINE_finish(ENGINE *engine)
if(engine-destroy)
(*engine-destroy)(engine);
-memset(engine, 0, sizeof(engine));
+memset(engine, 0, sizeof(*engine));
engine-references = -1;
Index: src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.1.1.1 Wed Apr 13 18:14:50 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c Thu Mar 27 16:10:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md2.c,v 1.1.1.1 2011/04/13 18:14:50 elric Exp $ */
+/* $NetBSD: md2.c,v 1.2 2014/03/27 16:10:45 apb Exp $ */
/*
* Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -132,5 +132,5 @@ MD2_Final (void *res, struct md2 *m)
MD2_Update(m, pad, 16);
memcpy(res, m-state, MD2_DIGEST_LENGTH);
-memset(m, 0, sizeof(m));
+memset(m, 0, sizeof(*m));
}
Index: src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.1.1.1 Wed Apr 13 18:15:29 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c Thu Mar 27 16:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ad.c,v 1.1.1.1 2011/04/13 18:15:29 elric Exp $ */
+/* $NetBSD: ad.c,v 1.2 2014/03/27 16:10:46 apb Exp $ */
/*
* Copyright (c) 2004 Kungliga Tekniska Högskolan
@@ -49,7 +49,7 @@
#include krb5/base64.h
#endif
-__RCSID($NetBSD: ad.c,v 1.1.1.1 2011/04/13 18:15:29 elric Exp $);
+__RCSID($NetBSD: ad.c,v 1.2 2014/03/27 16:10:46 apb Exp $);
#ifdef OPENLDAP
@@ -1289,7 +1289,7 @@ kadm5_ad_randkey_principal(void *server_
password,
principal,
(*keys)[0]);
- memset(password, 0, sizeof(password));
+ memset(password, 0, plen);
if (ret) {
free(*keys);
*keys = NULL;
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.1.1.1 Wed Apr 13 18:15:38 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c Thu Mar 27 16:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: test_pknistkdf.c,v 1.1.1.1 2011/04/13 18:15:38 elric Exp $ */
+/* $NetBSD: test_pknistkdf.c,v 1.2 2014/03/27 16:10:46 apb Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -143,7 +143,7 @@ test_dh2key(krb5_context context, int i,
AlgorithmIdentifier ai;
size_t size;
-memset(ticket, 0, sizeof(ticket));
+memset(ticket, 0, sizeof(ticket));
ai.algorithm = *c-oid;
ai.parameters = NULL;
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src Committed By: apb Date: Thu Mar 27 16:26:22 UTC 2014 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: rnd_keys.c Log Message: sizeof(array - 1) decays to sizeof(pointer), but (sizeof(array) - 1) was actually wanted. The effect of this bug is that only a few bytes of the hostname are mixed into the random seed, instead of using the entire hostname. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c diff -u src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c:1.2 --- src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c:1.1 Sun Jul 19 23:30:44 2009 +++ src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c Thu Mar 27 16:26:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rnd_keys.c,v 1.1 2009/07/19 23:30:44 christos Exp $ */ +/* $NetBSD: rnd_keys.c,v 1.2 2014/03/27 16:26:22 apb Exp $ */ #include des_locl.h #include sys/time.h @@ -72,7 +72,7 @@ des_init_random_number_generator(des_cbl SHA1Init(sha); - gethostname(hname, sizeof(hname - 1)); + gethostname(hname, sizeof(hname) - 1); gettimeofday(when, NULL); memcpy(seed_q, seed, sizeof(seed_q));
CVS commit: src/distrib/cdrom/macppc_installboot
Module Name:src Committed By: apb Date: Thu Mar 27 16:34:37 UTC 2014 Modified Files: src/distrib/cdrom/macppc_installboot: installboot.c Log Message: Use calloc instead of malloc + memset. This fixes a bug in which the wrong size was passed to memset. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/cdrom/macppc_installboot/installboot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/cdrom/macppc_installboot/installboot.c diff -u src/distrib/cdrom/macppc_installboot/installboot.c:1.4 src/distrib/cdrom/macppc_installboot/installboot.c:1.5 --- src/distrib/cdrom/macppc_installboot/installboot.c:1.4 Wed Mar 25 15:26:49 2009 +++ src/distrib/cdrom/macppc_installboot/installboot.c Thu Mar 27 16:34:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: installboot.c,v 1.4 2009/03/25 15:26:49 tsutsui Exp $ */ +/* $NetBSD: installboot.c,v 1.5 2014/03/27 16:34:37 apb Exp $ */ /*- * Copyright (c) 2005 Izumi Tsutsui. All rights reserved. @@ -118,12 +118,11 @@ main(int argc, char **argv) params-stage2 = argv[3]; - bb = malloc(MACPPC_BOOT_BLOCK_MAX_SIZE); + bb = calloc(1, MACPPC_BOOT_BLOCK_MAX_SIZE); if (bb == NULL) err(1, Allocating %ul bytes for bbinfo, MACPPC_BOOT_BLOCK_MAX_SIZE); - memset(bb, 0, sizeof(bb)); rv = read(params-s1fd, bb, params-s1stat.st_size); if (rv == -1)
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Thu Mar 27 17:31:56 UTC 2014
Modified Files:
src/sys/fs/ptyfs: ptyfs_subr.c ptyfs_vfsops.c
src/sys/kern: tty_bsdpty.c tty_ptm.c tty_pty.c
src/sys/sys: pty.h
Log Message:
From Ilya Zykov:
- ifdef out some code that is only used for NO_DEV_PTM
- pass the mountpoint instead of the ptm structure to the implementation
dependent (ptyfs or bsdpty) functions.
- add a function to return the correct ptyfs mountpoint for the current lwp
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/fs/ptyfs/ptyfs_subr.c
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/ptyfs/ptyfs_vfsops.c
cvs rdiff -u -r1.18 -r1.19 src/sys/kern/tty_bsdpty.c
cvs rdiff -u -r1.30 -r1.31 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.135 -r1.136 src/sys/kern/tty_pty.c
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/pty.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/ptyfs/ptyfs_subr.c
diff -u src/sys/fs/ptyfs/ptyfs_subr.c:1.28 src/sys/fs/ptyfs/ptyfs_subr.c:1.29
--- src/sys/fs/ptyfs/ptyfs_subr.c:1.28 Wed Mar 26 17:28:48 2014
+++ src/sys/fs/ptyfs/ptyfs_subr.c Thu Mar 27 13:31:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_subr.c,v 1.28 2014/03/26 21:28:48 christos Exp $ */
+/* $NetBSD: ptyfs_subr.c,v 1.29 2014/03/27 17:31:56 christos Exp $ */
/*
* Copyright (c) 1993
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.28 2014/03/26 21:28:48 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.29 2014/03/27 17:31:56 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -139,7 +139,7 @@ ptyfs_getinfo(struct ptyfsnode *ptyfs, s
* from the inode
*/
if ((error = (*ptyfs_save_ptm-makename)(
- ptyfs_save_ptm, l, ttyname, sizeof(ttyname),
+ NULL, l, ttyname, sizeof(ttyname),
ptyfs-ptyfs_pty, ptyfs-ptyfs_type == PTYFSpts ? 't'
: 'p')) != 0)
goto out;
Index: src/sys/fs/ptyfs/ptyfs_vfsops.c
diff -u src/sys/fs/ptyfs/ptyfs_vfsops.c:1.47 src/sys/fs/ptyfs/ptyfs_vfsops.c:1.48
--- src/sys/fs/ptyfs/ptyfs_vfsops.c:1.47 Sun Mar 23 11:21:15 2014
+++ src/sys/fs/ptyfs/ptyfs_vfsops.c Thu Mar 27 13:31:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vfsops.c,v 1.47 2014/03/23 15:21:15 hannken Exp $ */
+/* $NetBSD: ptyfs_vfsops.c,v 1.48 2014/03/27 17:31:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_vfsops.c,v 1.47 2014/03/23 15:21:15 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_vfsops.c,v 1.48 2014/03/27 17:31:56 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -72,11 +72,11 @@ VFS_PROTOS(ptyfs);
static struct sysctllog *ptyfs_sysctl_log;
-static int ptyfs__allocvp(struct ptm_pty *, struct lwp *, struct vnode **,
+static int ptyfs__allocvp(struct mount *, struct lwp *, struct vnode **,
dev_t, char);
-static int ptyfs__makename(struct ptm_pty *, struct lwp *, char *, size_t,
+static int ptyfs__makename(struct mount *, struct lwp *, char *, size_t,
dev_t, char);
-static void ptyfs__getvattr(struct ptm_pty *, struct lwp *, struct vattr *);
+static void ptyfs__getvattr(struct mount *, struct lwp *, struct vattr *);
/*
* ptm glue: When we mount, we make ptm point to us.
@@ -125,10 +125,9 @@ out:
}
static int
-ptyfs__makename(struct ptm_pty *pt, struct lwp *l, char *tbuf, size_t bufsiz,
+ptyfs__makename(struct mount *mp, struct lwp *l, char *tbuf, size_t bufsiz,
dev_t dev, char ms)
{
- struct mount *mp = pt-arg;
size_t len;
const char *np;
@@ -154,10 +153,9 @@ ptyfs__makename(struct ptm_pty *pt, stru
static int
/*ARGSUSED*/
-ptyfs__allocvp(struct ptm_pty *pt, struct lwp *l, struct vnode **vpp,
+ptyfs__allocvp(struct mount *mp, struct lwp *l, struct vnode **vpp,
dev_t dev, char ms)
{
- struct mount *mp = pt-arg;
ptyfstype type;
switch (ms) {
@@ -176,9 +174,8 @@ ptyfs__allocvp(struct ptm_pty *pt, struc
static void
-ptyfs__getvattr(struct ptm_pty *pt, struct lwp *l, struct vattr *vattr)
+ptyfs__getvattr(struct mount *mp, struct lwp *l, struct vattr *vattr)
{
- struct mount *mp = pt-arg;
struct ptyfsmount *pmnt = VFSTOPTY(mp);
vattr_null(vattr);
/* get real uid */
Index: src/sys/kern/tty_bsdpty.c
diff -u src/sys/kern/tty_bsdpty.c:1.18 src/sys/kern/tty_bsdpty.c:1.19
--- src/sys/kern/tty_bsdpty.c:1.18 Wed Mar 26 17:29:54 2014
+++ src/sys/kern/tty_bsdpty.c Thu Mar 27 13:31:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_bsdpty.c,v 1.18 2014/03/26 21:29:54 christos Exp $ */
+/* $NetBSD: tty_bsdpty.c,v 1.19 2014/03/27 17:31:56 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,10 +27,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_bsdpty.c,v 1.18 2014/03/26 21:29:54 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_bsdpty.c,v 1.19 2014/03/27 17:31:56 christos Exp $);
#include opt_ptm.h
+#ifndef
CVS commit: src/sys/arch
Module Name:src
Committed By: christos
Date: Thu Mar 27 18:22:56 UTC 2014
Modified Files:
src/sys/arch/dreamcast/dev/maple: maple.c
src/sys/arch/ia64/disasm: disasm_format.c
src/sys/arch/ia64/stand/efi/libefi: devicename.c
src/sys/arch/ia64/stand/ia64/ski: devicename.c
src/sys/arch/next68k/dev: esp.c
src/sys/arch/prep/prep: autoconf.c residual.c
src/sys/arch/sparc/sparc: cpu.c
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/arch/x86/x86: est.c odcm.c procfs_machdep.c
src/sys/arch/xen/xen: pciback.c
src/sys/arch/xen/xenbus: xenbus_client.c
Log Message:
correct/add protection against snprintf overflow.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/disasm/disasm_format.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/efi/libefi/devicename.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/devicename.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/next68k/dev/esp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/prep/prep/autoconf.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/prep/prep/residual.c
cvs rdiff -u -r1.242 -r1.243 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/x86/est.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/odcm.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/x86/procfs_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/xen/pciback.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/xen/xenbus/xenbus_client.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.49 src/sys/arch/dreamcast/dev/maple/maple.c:1.50
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.49 Wed Mar 26 12:08:45 2014
+++ src/sys/arch/dreamcast/dev/maple/maple.c Thu Mar 27 14:22:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.49 2014/03/26 16:08:45 christos Exp $ */
+/* $NetBSD: maple.c,v 1.50 2014/03/27 18:22:56 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: maple.c,v 1.49 2014/03/26 16:08:45 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: maple.c,v 1.50 2014/03/27 18:22:56 christos Exp $);
#include sys/param.h
#include sys/device.h
@@ -353,7 +353,9 @@ maple_run_polling(device_t dev)
static char *
maple_unit_name(char *buf, size_t len, int port, int subunit)
{
- int l = snprintf(buf, len, maple%c, port + 'A');
+ size_t l = snprintf(buf, len, maple%c, port + 'A');
+ if (l len)
+ l = len;
if (subunit)
snprintf(buf + l, len - l, %d, subunit);
Index: src/sys/arch/ia64/disasm/disasm_format.c
diff -u src/sys/arch/ia64/disasm/disasm_format.c:1.2 src/sys/arch/ia64/disasm/disasm_format.c:1.3
--- src/sys/arch/ia64/disasm/disasm_format.c:1.2 Tue Mar 25 14:35:32 2014
+++ src/sys/arch/ia64/disasm/disasm_format.c Thu Mar 27 14:22:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disasm_format.c,v 1.2 2014/03/25 18:35:32 christos Exp $ */
+/* $NetBSD: disasm_format.c,v 1.3 2014/03/27 18:22:56 christos Exp $ */
/*-
* Copyright (c) 2000-2003 Marcel Moolenaar
@@ -277,6 +277,8 @@ asm_operand(const struct asm_oper *o, ch
}
if (n[0] != '\0') {
l = snprintf(buf, buflen, %s[, n);
+ if (l buflen)
+ l = buflen;
buf += l;
buflen -= l;
}
@@ -284,7 +286,11 @@ asm_operand(const struct asm_oper *o, ch
case 1: l = strlcpy(buf, gp, buflen); break;
case 12: l = strlcpy(buf, sp, buflen); break;
case 13: l = strlcpy(buf, tp, buflen); break;
- default: l += snprintf(buf, buflen, r%d, (int)o-o_value); break;
+ default:
+ l += snprintf(buf, buflen, r%d, (int)o-o_value);
+ if (l buflen)
+ l = buflen;
+ break;
}
buf += l;
buflen -= l;
Index: src/sys/arch/ia64/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.6 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.7
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.6 Tue Mar 25 14:35:33 2014
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c Thu Mar 27 14:22:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: devicename.c,v 1.6 2014/03/25 18:35:33 christos Exp $ */
+/* $NetBSD: devicename.c,v 1.7 2014/03/27 18:22:56 christos Exp $ */
/*-
* Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -208,7 +208,7 @@ efi_fmtdev(void *vdev)
{
struct efi_devdesc *dev = (struct efi_devdesc *)vdev;
static char buf[128]; /* XXX device length constant? */
- size_t len;
+ size_t len, buflen = sizeof(buf);
switch(dev-d_type) {
case DEVT_NONE:
@@ -216,16 +216,24 @@ efi_fmtdev(void *vdev)
break;
case DEVT_DISK:
- len = snprintf(buf, sizeof(buf), %s%d, dev-d_dev-dv_name, dev-d_kind.efidisk.unit);
- if (dev-d_kind.efidisk.slice 0)
- len += snprintf(buf + len, sizeof(buf) - len,
CVS commit: src/sys/dev/filemon
Module Name:src
Committed By: christos
Date: Thu Mar 27 18:27:34 UTC 2014
Modified Files:
src/sys/dev/filemon: filemon.c filemon.h filemon_wrapper.c
Log Message:
remove a bunch of repetitive code by introducing filemon_printf.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/filemon/filemon.h \
src/sys/dev/filemon/filemon_wrapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.6 src/sys/dev/filemon/filemon.c:1.7
--- src/sys/dev/filemon/filemon.c:1.6 Sun Mar 16 01:20:27 2014
+++ src/sys/dev/filemon/filemon.c Thu Mar 27 14:27:34 2014
@@ -24,7 +24,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: filemon.c,v 1.6 2014/03/16 05:20:27 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: filemon.c,v 1.7 2014/03/27 18:27:34 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -121,18 +121,28 @@ filemon_output(struct filemon * filemon,
auio, curlwp-l_cred, FOF_UPDATE_OFFSET);
}
-static void
-filemon_comment(struct filemon * filemon)
+void
+filemon_printf(struct filemon *filemon, const char *fmt, ...)
{
- int len;
-
- len = snprintf(filemon-fm_msgbufr, sizeof(filemon-fm_msgbufr),
- # filemon version %d\n# Target pid %d\nV %d\n,
- FILEMON_VERSION, curproc-p_pid, FILEMON_VERSION);
+ size_t len;
+ va_list ap;
+ va_start(ap, fmt);
+ len = vsnprintf(filemon-fm_msgbufr, sizeof(filemon-fm_msgbufr),
+ fmt, ap);
+ va_end(ap);
+ if (len sizeof(filemon-fm_msgbufr))
+ len = sizeof(filemon-fm_msgbufr);
filemon_output(filemon, filemon-fm_msgbufr, len);
}
+static void
+filemon_comment(struct filemon * filemon)
+{
+ filemon_printf(filemon, # filemon version %d\n# Target pid %d\nV %d\n,
+ FILEMON_VERSION, curproc-p_pid, FILEMON_VERSION);
+}
+
static struct filemon *
filemon_pid_check(struct proc * p)
Index: src/sys/dev/filemon/filemon.h
diff -u src/sys/dev/filemon/filemon.h:1.4 src/sys/dev/filemon/filemon.h:1.5
--- src/sys/dev/filemon/filemon.h:1.4 Mon Nov 19 17:20:10 2012
+++ src/sys/dev/filemon/filemon.h Thu Mar 27 14:27:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.h,v 1.4 2012/11/19 22:20:10 sjg Exp $ */
+/* $NetBSD: filemon.h,v 1.5 2014/03/27 18:27:34 christos Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -49,6 +49,7 @@ struct filemon * filemon_lookup(struct p
void filemon_output(struct filemon *, char *, size_t);
void filemon_wrapper_install(void);
int filemon_wrapper_deinstall(void);
+void filemon_printf(struct filemon *, const char *, ...) __printflike(2, 3);
#endif
#endif
Index: src/sys/dev/filemon/filemon_wrapper.c
diff -u src/sys/dev/filemon/filemon_wrapper.c:1.4 src/sys/dev/filemon/filemon_wrapper.c:1.5
--- src/sys/dev/filemon/filemon_wrapper.c:1.4 Mon Nov 19 17:20:10 2012
+++ src/sys/dev/filemon/filemon_wrapper.c Thu Mar 27 14:27:34 2014
@@ -24,7 +24,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: filemon_wrapper.c,v 1.4 2012/11/19 22:20:10 sjg Exp $);
+__KERNEL_RCSID(0, $NetBSD: filemon_wrapper.c,v 1.5 2014/03/27 18:27:34 christos Exp $);
#include sys/param.h
#include sys/types.h
@@ -44,7 +44,6 @@ filemon_wrapper_chdir(struct lwp * l, co
int ret;
int error;
size_t done;
- size_t len;
struct filemon *filemon;
if ((ret = sys_chdir(l, uap, retval)) == 0) {
@@ -55,13 +54,9 @@ filemon_wrapper_chdir(struct lwp * l, co
error = copyinstr(SCARG(uap, path), filemon-fm_fname1,
sizeof(filemon-fm_fname1), done);
if (error == 0) {
-len = snprintf(filemon-fm_msgbufr,
-sizeof(filemon-fm_msgbufr),
+filemon_printf(filemon,
C %d %s\n,
curproc-p_pid, filemon-fm_fname1);
-
-filemon_output(filemon, filemon-fm_msgbufr,
-len);
}
rw_exit(filemon-fm_mtx);
}
@@ -77,7 +72,6 @@ filemon_wrapper_execve(struct lwp * l, s
int ret;
int error;
size_t done;
- size_t len;
struct filemon *filemon;
error = copyinstr(SCARG(uap, path), fname, sizeof(fname), done);
@@ -86,12 +80,8 @@ filemon_wrapper_execve(struct lwp * l, s
filemon = filemon_lookup(curproc);
if (filemon) {
-
- len = snprintf(filemon-fm_msgbufr, sizeof(filemon-fm_msgbufr),
- E %d %s\n,
+ filemon_printf(filemon, E %d %s\n,
curproc-p_pid, fname);
-
- filemon_output(filemon, filemon-fm_msgbufr, len);
rw_exit(filemon-fm_mtx);
}
}
@@ -103,20 +93,14 @@ static int
filemon_wrapper_fork(struct lwp * l, const void *v, register_t * retval)
{
int ret;
- size_t len;
struct filemon *filemon;
if ((ret = sys_fork(l, v, retval)) == 0) {
filemon = filemon_lookup(curproc);
if (filemon) {
- len = snprintf(filemon-fm_msgbufr,
- sizeof(filemon-fm_msgbufr),
- F %d %ld\n,
+ filemon_printf(filemon, F %d %ld\n,
curproc-p_pid, (long) retval[0]);
-
- filemon_output(filemon,
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Mar 27 18:28:26 UTC 2014
Modified Files:
src/sys/dev/ic: aic79xx.c aic7xxx.c mpt_debug.c
Log Message:
cleanup debugging printfs to avoid overflow
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/aic79xx.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/ic/aic7xxx.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/mpt_debug.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic79xx.c
diff -u src/sys/dev/ic/aic79xx.c:1.46 src/sys/dev/ic/aic79xx.c:1.47
--- src/sys/dev/ic/aic79xx.c:1.46 Thu Oct 17 17:24:24 2013
+++ src/sys/dev/ic/aic79xx.c Thu Mar 27 14:28:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.c,v 1.46 2013/10/17 21:24:24 christos Exp $ */
+/* $NetBSD: aic79xx.c,v 1.47 2014/03/27 18:28:26 christos Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aic79xx.c,v 1.46 2013/10/17 21:24:24 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: aic79xx.c,v 1.47 2014/03/27 18:28:26 christos Exp $);
#include dev/ic/aic79xx_osm.h
#include dev/ic/aic79xx_inline.h
@@ -5963,26 +5963,23 @@ ahd_controller_info(struct ahd_softc *ah
{
const char *speed;
const char *type;
- int len;
- char *ep;
+ size_t len;
- ep = tbuf + l;
-
- len = snprintf(tbuf, ep - tbuf, %s: ,
+ len = snprintf(tbuf, l, %s: ,
ahd_chip_names[ahd-chip AHD_CHIPID_MASK]);
- tbuf += len;
-
+ if (len l)
+ return;
speed = Ultra320 ;
if ((ahd-features AHD_WIDE) != 0) {
type = Wide ;
} else {
type = Single ;
}
- len = snprintf(tbuf, ep - tbuf, %s%sChannel %c, SCSI Id=%d, ,
+ len += snprintf(tbuf + len, l - len, %s%sChannel %c, SCSI Id=%d, ,
speed, type, ahd-channel, ahd-our_id);
- tbuf += len;
-
- snprintf(tbuf, ep - tbuf, %s, %d SCBs, ahd-bus_description,
+ if (len l)
+ return;
+ snprintf(tbuf + len, l - len, %s, %d SCBs, ahd-bus_description,
ahd-scb_data.maxhscbs);
}
@@ -8597,7 +8594,7 @@ ahd_print_register(ahd_reg_parse_entry_t
const char *name, u_int address, u_int value,
u_int *cur_column, u_int wrap_point)
{
- int printed;
+ size_t printed;
u_int printed_mask;
charline[1024];
@@ -8608,9 +8605,13 @@ ahd_print_register(ahd_reg_parse_entry_t
*cur_column = 0;
}
printed = snprintf(line, sizeof(line), %s[0x%x], name, value);
+ if (printed sizeof(line))
+ printed = sizeof(line);
if (table == NULL) {
printed += snprintf(line[printed], (sizeof line) - printed,
);
+ if (printed sizeof(line))
+ printed = sizeof(line);
printf(%s, line);
if (cur_column != NULL)
*cur_column += printed;
@@ -8626,6 +8627,8 @@ ahd_print_register(ahd_reg_parse_entry_t
|| ((printed_mask table[entry].mask)
== table[entry].mask))
continue;
+ if (printed sizeof(line))
+printed = sizeof(line);
printed += snprintf(line[printed],
(sizeof line) - printed, %s%s,
printed_mask == 0 ? :( : |,
@@ -8637,6 +8640,8 @@ ahd_print_register(ahd_reg_parse_entry_t
if (entry = num_entries)
break;
}
+ if (printed sizeof(line))
+ printed = sizeof(line);
if (printed_mask != 0)
printed += snprintf(line[printed],
(sizeof line) - printed, ) );
Index: src/sys/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.130 src/sys/dev/ic/aic7xxx.c:1.131
--- src/sys/dev/ic/aic7xxx.c:1.130 Thu Sep 3 10:40:43 2009
+++ src/sys/dev/ic/aic7xxx.c Thu Mar 27 14:28:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.130 2009/09/03 14:40:43 tsutsui Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.131 2014/03/27 18:28:26 christos Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.130 2009/09/03 14:40:43 tsutsui Exp $
+ * $Id: aic7xxx.c,v 1.131 2014/03/27 18:28:26 christos Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aic7xxx.c,v 1.130 2009/09/03 14:40:43 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: aic7xxx.c,v 1.131 2014/03/27 18:28:26 christos Exp $);
#include dev/ic/aic7xxx_osm.h
#include dev/ic/aic7xxx_inline.h
@@ -4390,19 +4390,17 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
void
ahc_controller_info(struct ahc_softc *ahc, char *tbuf, size_t l)
{
- int len;
- char *ep;
+ size_t len;
- ep = tbuf + l;
-
- len = snprintf(tbuf, ep - tbuf, %s: ,
+ len = snprintf(tbuf, l, %s: ,
ahc_chip_names[ahc-chip AHC_CHIPID_MASK]);
- tbuf += len;
+ if (len l)
+ return;
if ((ahc-features AHC_TWIN) != 0)
- len = snprintf(tbuf, ep - tbuf, Twin Channel, A SCSI Id=%d,
- B SCSI Id=%d, primary %c, ,
- ahc-our_id, ahc-our_id_b,
- (ahc-flags AHC_PRIMARY_CHANNEL) + 'A');
+ len += snprintf(tbuf + len, l - len,
+ Twin
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: apb Date: Thu Mar 27 19:34:39 UTC 2014 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_printf.c Log Message: format is a pointer, so sizeof(format) is not a good length to pass to snprintf. Try to calculate the correct length, taking into account the amount of space already used. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.5 --- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c:1.4 Wed Feb 20 22:45:12 2013 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c Thu Mar 27 19:34:39 2014 @@ -1861,10 +1861,10 @@ dtrace_printf_format(dtrace_hdl_t *dtp, *f++ = '@'; if (width != 0) - f += snprintf(f, sizeof (format), %d, width); + f += snprintf(f, format + formatlen - f, %d, width); if (prec != 0) - f += snprintf(f, sizeof (format), .%d, prec); + f += snprintf(f, format + formatlen - f, .%d, prec); /* * If the output format is %s, then either %s is the underlying
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Mar 27 21:09:33 UTC 2014
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
explain how a printf might happen (since it has bitten more than one person)
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 src/sys/kern/kern_sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.248 src/sys/kern/kern_sysctl.c:1.249
--- src/sys/kern/kern_sysctl.c:1.248 Sat Mar 1 12:27:48 2014
+++ src/sys/kern/kern_sysctl.c Thu Mar 27 17:09:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.248 2014/03/01 17:27:48 dsl Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sysctl.c,v 1.248 2014/03/01 17:27:48 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $);
#include opt_defcorename.h
#include ksyms.h
@@ -2105,6 +2105,11 @@ sysctl_createv(struct sysctllog **log, i
pnode = root;
error = sysctl_locate(NULL, name[0], namelen - 1, pnode, ni);
if (error) {
+ /*
+ * XXX: If you are seeing this printf in early bringup
+ * stages, perhaps your setfault is not functioning and
+ * thus kcopy() is mis-behaving.
+ */
printf(sysctl_createv: sysctl_locate(%s) returned %d\n,
nnode.sysctl_name, error);
sysctl_unlock();
CVS commit: [matt-nb5-mips64] src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Thu Mar 27 21:11:11 UTC 2014 Modified Files: src/sys/arch/arm/include [matt-nb5-mips64]: param.h Log Message: #define ALIGNBYTES __ALIGNBYTES To generate a diff of this commit: cvs rdiff -u -r1.12.12.3 -r1.12.12.4 src/sys/arch/arm/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/param.h diff -u src/sys/arch/arm/include/param.h:1.12.12.3 src/sys/arch/arm/include/param.h:1.12.12.4 --- src/sys/arch/arm/include/param.h:1.12.12.3 Thu Mar 27 01:04:39 2014 +++ src/sys/arch/arm/include/param.h Thu Mar 27 21:11:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.12.12.3 2014/03/27 01:04:39 matt Exp $ */ +/* $NetBSD: param.h,v 1.12.12.4 2014/03/27 21:11:11 matt Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -148,7 +148,7 @@ #define MID_MACHINE MID_ARM6 /* ARM-specific macro to align a stack pointer (downwards). */ -#define ALIGNBYTES (__ALIGNBYTES + 1) +#define ALIGNBYTES __ALIGNBYTES #define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) ~ALIGNBYTES) #define ALIGNED_POINTER(p,t) (((uintptr_t)(p) % sizeof(t)) == 0) #define STACKALIGNBYTES (8 - 1)
CVS commit: src/sys/fs/ptyfs
Module Name:src
Committed By: christos
Date: Thu Mar 27 21:13:06 UTC 2014
Modified Files:
src/sys/fs/ptyfs: ptyfs_vnops.c
Log Message:
forgot to commit one patch:
Avoid returning released(free), but still hashed inode numbers.
(Ilya Zykov)
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/fs/ptyfs/ptyfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.44 src/sys/fs/ptyfs/ptyfs_vnops.c:1.45
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.44 Fri Mar 21 13:21:53 2014
+++ src/sys/fs/ptyfs/ptyfs_vnops.c Thu Mar 27 17:13:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vnops.c,v 1.44 2014/03/21 17:21:53 christos Exp $ */
+/* $NetBSD: ptyfs_vnops.c,v 1.45 2014/03/27 21:13:06 christos Exp $ */
/*
* Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_vnops.c,v 1.44 2014/03/21 17:21:53 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_vnops.c,v 1.45 2014/03/27 21:13:06 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -616,7 +616,8 @@ ptyfs_lookup(void *v)
pty = atoi(pname, cnp-cn_namelen);
- if (pty 0 || pty = npty || pty_isfree(pty, 1))
+ if (pty 0 || pty = npty || pty_isfree(pty, 1) ||
+ ptyfs_used_get(PTYFSptc, pty, dvp-v_mount, 0) == NULL)
break;
error = ptyfs_allocvp(dvp-v_mount, vpp, PTYFSpts, pty,
@@ -711,7 +712,8 @@ ptyfs_readdir(void *v)
}
for (; uio-uio_resid = UIO_MX i npty; i++) {
/* check for used ptys */
- if (ptyfs_used_get(PTYFSptc, i - 2, vp-v_mount, 0) == NULL)
+ if (pty_isfree(i - 2, 1) ||
+ ptyfs_used_get(PTYFSptc, i - 2, vp-v_mount, 0) == NULL)
continue;
dp-d_fileno = PTYFS_FILENO(i - 2, PTYFSpts);
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: christos
Date: Thu Mar 27 21:21:47 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
add missing dependencies (Takahiro HAYASHI)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.2 src/sys/external/bsd/drm2/drm/files.drmkms:1.3
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.2 Tue Mar 18 14:20:42 2014
+++ src/sys/external/bsd/drm2/drm/files.drmkms Thu Mar 27 17:21:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.2 2014/03/18 18:20:42 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.3 2014/03/27 21:21:47 christos Exp $
define drmkmsbus { }
@@ -11,7 +11,7 @@ include external/bsd/drm2/linux/files.d
define drmkms_i2c
define drmkms
-device drmkms: drmkms_linux, drmkms_i2c
+device drmkms: drmkms_linux, drmkms_i2c, i2cexec, i2c_bitbang
attach drmkms at drmkmsbus
defflag opt_drmkms.h DRMKMS_DEBUG
CVS commit: src/sys/external/bsd/vchiq/dist/interface
Module Name:src
Committed By: skrll
Date: Thu Mar 27 23:03:07 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
src/sys/external/bsd/vchiq/dist/interface/vchi: vchi_cfg.h
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_arm.c
vchiq_core.c vchiq_core.h vchiq_if.h vchiq_ioctl.h vchiq_kern_lib.c
vchiq_shim.c vchiq_util.c
Log Message:
Merge upstream fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_shim.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_if.h \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_ioctl.h \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.5 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.6
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.5 Wed Mar 26 16:44:41 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Mar 27 23:03:06 2014
@@ -391,6 +391,10 @@ typedef off_t loff_t;
#define wmb membar_producer
#define dsb membar_producer
+#define smp_mb membar_producer
+#define smp_rmb membar_consumer
+#define smp_wmb membar_producer
+
#define device_print_prettyname(dev) device_printf((dev), )
#endif /* __VCHI_NETBSD_H__ */
Index: src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h
diff -u src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h:1.1 src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h:1.2
--- src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h:1.1 Fri Mar 8 12:32:30 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h Thu Mar 27 23:03:07 2014
@@ -41,7 +41,6 @@
/* Required alignment of base addresses for bulk transfer, if unaligned transfers are not enabled */
/* Really determined by the message driver, and should be available from a run-time call. */
-/* XXX: fixme */
#ifndef VCHI_BULK_ALIGN
# if __VCCOREVER__ = 0x0400
# define VCHI_BULK_ALIGN 32 // Allows for the need to do cache cleans
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.10 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.11
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.10 Tue Mar 25 15:33:22 2014
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c Thu Mar 27 23:03:07 2014
@@ -384,6 +384,22 @@ service_callback(VCHIQ_REASON_T reason,
/
*
+* user_service_free
+*
+***/
+static void
+user_service_free(void *userdata)
+{
+ USER_SERVICE_T *user_service = userdata;
+
+ _sema_destroy(user_service-insert_event);
+ _sema_destroy(user_service-remove_event);
+
+ kfree(user_service);
+}
+
+/
+*
* vchiq_ioctl
*
***/
@@ -465,7 +481,7 @@ vchiq_ioctl(struct file *fp, u_long cmd,
void *userdata;
int srvstate;
- user_service = kmalloc(sizeof(USER_SERVICE_T), GFP_KERNEL);
+ user_service = kzalloc(sizeof(USER_SERVICE_T), GFP_KERNEL);
if (!user_service) {
ret = -ENOMEM;
break;
@@ -491,7 +507,7 @@ vchiq_ioctl(struct file *fp, u_long cmd,
service = vchiq_add_service_internal(
instance-state,
pargs-params, srvstate,
-instance);
+instance, user_service_free);
if (service != NULL) {
user_service-service = service;
@@ -514,8 +530,6 @@ vchiq_ioctl(struct file *fp, u_long cmd,
service = NULL;
ret = (status == VCHIQ_RETRY) ?
-EINTR : -EIO;
- user_service-service = NULL;
- user_service-instance = NULL;
break;
}
}
@@ -655,14 +669,14 @@ vchiq_ioctl(struct file *fp, u_long cmd,
lmutex_unlock(instance-bulk_waiter_list_mutex);
if (!waiter) {
vchiq_log_error(vchiq_arm_log_level,
- no bulk_waiter found for pid %d,
-
CVS commit: [matt-nb5-mips64] src/sys/arch/arm/cortex
Module Name:src Committed By: matt Date: Thu Mar 27 23:21:36 UTC 2014 Modified Files: src/sys/arch/arm/cortex [matt-nb5-mips64]: a9_mpsubr.S Log Message: Don't = since that isn't BE8 friendly To generate a diff of this commit: cvs rdiff -u -r1.12.2.5 -r1.12.2.6 src/sys/arch/arm/cortex/a9_mpsubr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/a9_mpsubr.S diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.12.2.5 src/sys/arch/arm/cortex/a9_mpsubr.S:1.12.2.6 --- src/sys/arch/arm/cortex/a9_mpsubr.S:1.12.2.5 Wed Mar 26 02:13:54 2014 +++ src/sys/arch/arm/cortex/a9_mpsubr.S Thu Mar 27 23:21:36 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: a9_mpsubr.S,v 1.12.2.5 2014/03/26 02:13:54 matt Exp $ */ +/* $NetBSD: a9_mpsubr.S,v 1.12.2.6 2014/03/27 23:21:36 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -341,7 +341,7 @@ cortex_init: bl _C_LABEL(armv7_icache_inv_all) @ invalidate i-cache #else adr ip, cortex_init - ldr r0, =armv7_icache_inv_all + ldr r0, .Larmv7_icache_inv_all bfi ip, r0, #0, #28 blx ip #endif @@ -370,7 +370,7 @@ cortex_init: bl _C_LABEL(armv7_dcache_wbinv_all) @ writeback/invalidate d-cache #else adr ip, cortex_init - ldr r0, =armv7_dcache_wbinv_all + ldr r0, .Larmv7_dcache_wbinv_all bfi ip, r0, #0, #28 blx ip #endif @@ -401,7 +401,7 @@ cortex_init: bl _C_LABEL(armv7_icache_inv_all) @ invalidate i-cache #else adr ip, cortex_init - ldr r0, =armv7_icache_inv_all + ldr r0, .Larmv7_icache_inv_all bfi ip, r0, #0, #28 blx ip #endif @@ -432,6 +432,13 @@ cortex_init: #endif bx r10 + +#ifndef KERNEL_BASES_EQUAL +.Larmv7_icache_inv_all: + .word armv7_icache_inv_all +.Larmv7_dcache_wbinv_all: + .word armv7_dcache_wbinv_all +#endif ASEND(a9_start) /*
CVS commit: src/sys/dev/iscsi
Module Name:src
Committed By: christos
Date: Fri Mar 28 02:15:56 UTC 2014
Modified Files:
src/sys/dev/iscsi: iscsi_text.c
Log Message:
avoid buffer overflow
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/iscsi/iscsi_text.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/iscsi/iscsi_text.c
diff -u src/sys/dev/iscsi/iscsi_text.c:1.6 src/sys/dev/iscsi/iscsi_text.c:1.7
--- src/sys/dev/iscsi/iscsi_text.c:1.6 Sun Aug 12 09:26:18 2012
+++ src/sys/dev/iscsi/iscsi_text.c Thu Mar 27 22:15:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_text.c,v 1.6 2012/08/12 13:26:18 mlelstv Exp $ */
+/* $NetBSD: iscsi_text.c,v 1.7 2014/03/28 02:15:56 christos Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -683,6 +683,8 @@ put_parameter(uint8_t *buf, unsigned len
}
cc = snprintf(buf, len, %s=, entries[par-key].name);
+ if (cc = len)
+ return len;
for (i = 0; i par-list_num; i++) {
switch (entries[par-key].val) {
@@ -759,11 +761,17 @@ put_parameter(uint8_t *buf, unsigned len
DEB(10, (put_par: value '%s'\n,buf[cc]));
cc += cl;
+ if (cc = len)
+ return len;
if ((i + 1) par-list_num) {
+ if (cc = len)
+return len;
buf[cc++] = ',';
}
}
+ if (cc = len)
+ return len;
buf[cc] = 0x0;/* make sure it's terminated */
return cc + 1;/* return next place in list */
}
CVS commit: src/sys/dev/ieee1394
Module Name:src
Committed By: christos
Date: Fri Mar 28 02:16:47 UTC 2014
Modified Files:
src/sys/dev/ieee1394: fwcrom.c
Log Message:
Deal with snprintf more gracefully.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ieee1394/fwcrom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/fwcrom.c
diff -u src/sys/dev/ieee1394/fwcrom.c:1.13 src/sys/dev/ieee1394/fwcrom.c:1.14
--- src/sys/dev/ieee1394/fwcrom.c:1.13 Thu Aug 26 03:36:53 2010
+++ src/sys/dev/ieee1394/fwcrom.c Thu Mar 27 22:16:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fwcrom.c,v 1.13 2010/08/26 07:36:53 cegger Exp $ */
+/* $NetBSD: fwcrom.c,v 1.14 2014/03/28 02:16:47 christos Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fwcrom.c,v 1.13 2010/08/26 07:36:53 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: fwcrom.c,v 1.14 2014/03/28 02:16:47 christos Exp $);
#include sys/param.h
#ifdef _KERNEL
@@ -283,44 +283,45 @@ crom_desc_specver(uint32_t spec, uint32_
}
const char *
-crom_desc(struct crom_context *cc, char *buf, int len)
+crom_desc(struct crom_context *cc, char *buf, size_t len)
{
struct csrreg *reg;
struct csrdirectory *dir;
const char *desc;
uint16_t crc;
+ size_t l = 0;
reg = crom_get(cc);
switch (reg-key CSRTYPE_MASK) {
case CSRTYPE_I:
#if 0
- len -= snprintf(buf, len, 0x%x, reg-val);
- buf += strlen(buf);
+ l += snprintf(buf + l, len - l, 0x%x, reg-val);
#else
*buf = '\0';
#endif
break;
case CSRTYPE_C:
- len -=
- snprintf(buf, len, offset=0x%04x(%d), reg-val, reg-val);
- buf += strlen(buf);
+ l += snprintf(buf + l, len - l, offset=0x%04x(%d),
+ reg-val, reg-val);
break;
case CSRTYPE_L:
/* XXX fall through */
case CSRTYPE_D:
dir = (struct csrdirectory *) (reg + reg-val);
crc = crom_crc((uint32_t *)dir-entry, dir-crc_len);
- len -= snprintf(buf, len, len=%d crc=0x%04x ,
+ l += snprintf(buf + l, len - l, len=%d crc=0x%04x ,
dir-crc_len, crc);
- buf += strlen(buf);
+ if (l len)
+ l = len;
if (crc == dir-crc)
- len -= snprintf(buf, len, (OK) );
+ l += snprintf(buf + l, len - l, (OK) );
else
- len -= snprintf(buf, len, (NG, 0x%x) ,
+ l += snprintf(buf + l, len - l, (NG, 0x%x) ,
dir-crc);
- buf += strlen(buf);
}
+ if (l len)
+ l = len;
switch (reg-key) {
case CSRKEY_VENDOR: /* 0x03 */
desc = module_vendor_ID;
@@ -374,7 +375,7 @@ crom_desc(struct crom_context *cc, char
case CROM_TEXTLEAF: /* 0x81 */
case CROM_TEXTLEAF2: /* 0x82 */
desc = text_leaf;
- crom_parse_text(cc, buf + strlen(buf), len);
+ crom_parse_text(cc, buf + l, len - l);
break;
case CROM_NODEID: /* 0x8d */
desc = node_unique_ID;
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: ozaki-r
Date: Fri Mar 28 02:50:18 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/cmd/zdb: zdb.c
src/external/cddl/osnet/dist/cmd/ztest: ztest.c
src/external/cddl/osnet/dist/lib/libzpool/common: util.c
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Add missing 3rd argument of nicenum
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/cmd/zdb/zdb.c
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/cmd/ztest/ztest.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/lib/libzpool/common/util.c
cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/sys/sys/zfs_context.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/zdb/zdb.c
diff -u src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.3
--- src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.2 Thu Mar 27 15:50:48 2014
+++ src/external/cddl/osnet/dist/cmd/zdb/zdb.c Fri Mar 28 02:50:18 2014
@@ -462,7 +462,7 @@ dump_metaslab_stats(metaslab_t *msp)
avl_tree_t *t = sm-sm_pp_root;
int free_pct = sm-sm_space * 100 / sm-sm_size;
- nicenum(space_map_maxsize(sm), maxbuf);
+ nicenum(space_map_maxsize(sm), maxbuf, sizeof(maxbuf));
(void) printf(\t %25s %10lu %7s %6s %4s %4d%%\n,
segments, avl_numnodes(t), maxsize, maxbuf,
@@ -478,7 +478,7 @@ dump_metaslab(metaslab_t *msp)
space_map_obj_t *smo = msp-ms_smo;
char freebuf[5];
- nicenum(sm-sm_size - smo-smo_alloc, freebuf);
+ nicenum(sm-sm_size - smo-smo_alloc, freebuf, sizeof(freebuf));
(void) printf(
\tmetaslab %6llu offset %12llx spacemap %6llu free%5s\n,
@@ -969,15 +969,15 @@ dump_dsl_dir(objset_t *os, uint64_t obje
(u_longlong_t)dd-dd_origin_obj);
(void) printf(\t\tchild_dir_zapobj = %llu\n,
(u_longlong_t)dd-dd_child_dir_zapobj);
- nicenum(dd-dd_used_bytes, nice);
+ nicenum(dd-dd_used_bytes, nice, sizeof(nice));
(void) printf(\t\tused_bytes = %s\n, nice);
- nicenum(dd-dd_compressed_bytes, nice);
+ nicenum(dd-dd_compressed_bytes, nice, sizeof(nice));
(void) printf(\t\tcompressed_bytes = %s\n, nice);
- nicenum(dd-dd_uncompressed_bytes, nice);
+ nicenum(dd-dd_uncompressed_bytes, nice, sizeof(nice));
(void) printf(\t\tuncompressed_bytes = %s\n, nice);
- nicenum(dd-dd_quota, nice);
+ nicenum(dd-dd_quota, nice, sizeof(nice));
(void) printf(\t\tquota = %s\n, nice);
- nicenum(dd-dd_reserved, nice);
+ nicenum(dd-dd_reserved, nice, sizeof(nice));
(void) printf(\t\treserved = %s\n, nice);
(void) printf(\t\tprops_zapobj = %llu\n,
(u_longlong_t)dd-dd_props_zapobj);
@@ -987,7 +987,7 @@ dump_dsl_dir(objset_t *os, uint64_t obje
(u_longlong_t)dd-dd_flags);
#define DO(which) \
- nicenum(dd-dd_used_breakdown[DD_USED_ ## which], nice); \
+ nicenum(dd-dd_used_breakdown[DD_USED_ ## which], nice, sizeof(nice)); \
(void) printf(\t\tused_breakdown[ #which ] = %s\n, nice)
DO(HEAD);
DO(SNAP);
@@ -1011,10 +1011,10 @@ dump_dsl_dataset(objset_t *os, uint64_t
ASSERT(size == sizeof (*ds));
crtime = ds-ds_creation_time;
- nicenum(ds-ds_used_bytes, used);
- nicenum(ds-ds_compressed_bytes, compressed);
- nicenum(ds-ds_uncompressed_bytes, uncompressed);
- nicenum(ds-ds_unique_bytes, unique);
+ nicenum(ds-ds_used_bytes, used, sizeof(used));
+ nicenum(ds-ds_compressed_bytes, compressed, sizeof(compressed));
+ nicenum(ds-ds_uncompressed_bytes, uncompressed, sizeof(uncompressed));
+ nicenum(ds-ds_unique_bytes, unique, sizeof(unique));
snprintf_blkptr(blkbuf, sizeof(blkbuf), ds-ds_bp);
(void) printf(\t\tdir_obj = %llu\n,
@@ -1074,10 +1074,10 @@ dump_bplist(objset_t *mos, uint64_t obje
return;
}
- nicenum(bpl.bpl_phys-bpl_bytes, bytes);
+ nicenum(bpl.bpl_phys-bpl_bytes, bytes, sizeof(bytes));
if (bpl.bpl_dbuf-db_size == sizeof (bplist_phys_t)) {
- nicenum(bpl.bpl_phys-bpl_comp, comp);
- nicenum(bpl.bpl_phys-bpl_uncomp, uncomp);
+ nicenum(bpl.bpl_phys-bpl_comp, comp, sizeof(comp));
+ nicenum(bpl.bpl_phys-bpl_uncomp, uncomp, sizeof(uncomp));
(void) printf(\n%s: %llu entries, %s (%s/%s comp)\n,
name, (u_longlong_t)bpl.bpl_phys-bpl_entries,
bytes, comp, uncomp);
@@ -1300,11 +1300,11 @@ dump_object(objset_t *os, uint64_t objec
}
dmu_object_info_from_dnode(dn, doi);
- nicenum(doi.doi_metadata_block_size, iblk);
- nicenum(doi.doi_data_block_size, dblk);
- nicenum(doi.doi_max_offset, lsize);
- nicenum(doi.doi_physical_blocks_512 9, asize);
- nicenum(doi.doi_bonus_size, bonus_size);
+ nicenum(doi.doi_metadata_block_size, iblk, sizeof(iblk));
+ nicenum(doi.doi_data_block_size, dblk, sizeof(dblk));
+ nicenum(doi.doi_max_offset, lsize, sizeof(lsize));
+ nicenum(doi.doi_physical_blocks_512 9, asize, sizeof(asize));
+ nicenum(doi.doi_bonus_size, bonus_size, sizeof(bonus_size));
(void) snprintf(fill, %6.2f, 100.0 *
CVS commit: src/external/cddl/osnet/dist
Module Name:src
Committed By: ozaki-r
Date: Fri Mar 28 02:58:36 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c
src/external/cddl/osnet/dist/cmd/zdb: zdb.c
src/external/cddl/osnet/dist/cmd/ztest: ztest.c
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_link.c
Log Message:
Fix some snprintf
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/cmd/zdb/zdb.c
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dist/cmd/ztest/ztest.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.3 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.4
--- src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.3 Thu Mar 27 15:50:48 2014
+++ src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c Fri Mar 28 02:58:36 2014
@@ -953,7 +953,7 @@ bufhandler(const dtrace_bufdata_t *bufda
uint8_t *data;
int lim = rec-dtrd_size;
- (void) snprintf(buf, end, %d (data: , rec-dtrd_offset);
+ (void) snprintf(buf, end - buf, %d (data: , rec-dtrd_offset);
c = buf + strlen(buf);
if (lim sizeof (uint64_t))
Index: src/external/cddl/osnet/dist/cmd/zdb/zdb.c
diff -u src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.3 src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.4
--- src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.3 Fri Mar 28 02:50:18 2014
+++ src/external/cddl/osnet/dist/cmd/zdb/zdb.c Fri Mar 28 02:58:36 2014
@@ -1305,7 +1305,7 @@ dump_object(objset_t *os, uint64_t objec
nicenum(doi.doi_max_offset, lsize, sizeof(lsize));
nicenum(doi.doi_physical_blocks_512 9, asize, sizeof(asize));
nicenum(doi.doi_bonus_size, bonus_size, sizeof(bonus_size));
- (void) snprintf(fill, %6.2f, 100.0 * doi.doi_fill_count *
+ (void) snprintf(fill, sizeof(fill), %6.2f, 100.0 * doi.doi_fill_count *
doi.doi_data_block_size / (object == 0 ? DNODES_PER_BLOCK : 1) /
doi.doi_max_offset);
@@ -1423,6 +1423,7 @@ dump_dir(objset_t *os)
nicenum(refdbytes, numbuf, sizeof(numbuf));
if (verbosity = 4) {
+ size_t blklen = sizeof(blkbuf);
len = snprintf(blkbuf, blklen, , rootbp );
if (len blklen)
len = blklen;
Index: src/external/cddl/osnet/dist/cmd/ztest/ztest.c
diff -u src/external/cddl/osnet/dist/cmd/ztest/ztest.c:1.6 src/external/cddl/osnet/dist/cmd/ztest/ztest.c:1.7
--- src/external/cddl/osnet/dist/cmd/ztest/ztest.c:1.6 Fri Mar 28 02:50:18 2014
+++ src/external/cddl/osnet/dist/cmd/ztest/ztest.c Fri Mar 28 02:58:36 2014
@@ -2239,7 +2239,7 @@ ztest_vdev_aux_add_remove(ztest_ds_t *zd
for (;;) {
char path[MAXPATHLEN];
int c;
- (void) snprintf(path, sizeof(pathbuf), ztest_aux_template, zopt_dir,
+ (void) snprintf(path, sizeof(path), ztest_aux_template, zopt_dir,
zopt_pool, aux, zs-zs_vdev_aux);
for (c = 0; c sav-sav_count; c++)
if (strcmp(sav-sav_vdevs[c]-vdev_path,
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.5 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.6
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.5 Thu Mar 27 15:50:48 2014
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Fri Mar 28 02:58:36 2014
@@ -1497,7 +1497,7 @@ process_obj(dtrace_hdl_t *dtp, const cha
r = (char *)data_str-d_buf + istr;
istr += 1 + snprintf(r, data_str-d_size -
- (istr - (char *)data_str-d_buf), dt_symfmt,
+(istr - (size_t)data_str-d_buf), dt_symfmt,
dt_symprefix, objkey, s);
isym++;
assert(isym = nsym);
CVS commit: src/external/cddl/osnet/dist/cmd/zdb
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 03:11:00 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/zdb: zdb.c Log Message: Add missing 4th argument of ddt_object_name To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/cmd/zdb/zdb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/cmd/zdb/zdb.c diff -u src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.4 src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.5 --- src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.4 Fri Mar 28 02:58:36 2014 +++ src/external/cddl/osnet/dist/cmd/zdb/zdb.c Fri Mar 28 03:11:00 2014 @@ -623,7 +623,7 @@ dump_ddt(ddt_t *ddt, enum ddt_type type, ASSERT(count != 0); /* we should have destroyed it */ - ddt_object_name(ddt, type, class, name); + ddt_object_name(ddt, type, class, name, sizeof(name)); (void) printf(%s: %llu entries, size %llu on disk, %llu in core\n, name,
CVS commit: src/external/cddl/osnet/dist
Module Name:src
Committed By: ozaki-r
Date: Fri Mar 28 03:18:24 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/cmd/zdb: zdb.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: spa.h
Log Message:
Fix migrating to snprintf_blkptr
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/cmd/zdb/zdb.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/zdb/zdb.c
diff -u src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.5 src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.6
--- src/external/cddl/osnet/dist/cmd/zdb/zdb.c:1.5 Fri Mar 28 03:11:00 2014
+++ src/external/cddl/osnet/dist/cmd/zdb/zdb.c Fri Mar 28 03:18:24 2014
@@ -1427,7 +1427,7 @@ dump_dir(objset_t *os)
len = snprintf(blkbuf, blklen, , rootbp );
if (len blklen)
len = blklen;
- printf_blkptr(blkbuf + len, blklen - len, os-os_rootbp);
+ snprintf_blkptr(blkbuf + len, blklen - len, os-os_rootbp);
} else {
blkbuf[0] = '\0';
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h:1.1.1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h:1.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h:1.1.1.2 Sat Feb 27 22:31:42 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h Fri Mar 28 03:18:24 2014
@@ -592,7 +592,7 @@ extern char *spa_strdup(const char *);
extern void spa_strfree(char *);
extern uint64_t spa_get_random(uint64_t range);
extern uint64_t spa_generate_guid(spa_t *spa);
-extern void sprintf_blkptr(char *buf, const blkptr_t *bp);
+extern void snprintf_blkptr(char *buf, const blkptr_t *bp);
extern void spa_freeze(spa_t *spa);
extern void spa_upgrade(spa_t *spa, uint64_t version);
extern void spa_evict_all(void);
@@ -672,7 +672,7 @@ extern void spa_event_notify(spa_t *spa,
#define dprintf_bp(bp, fmt, ...) do {\
if (zfs_flags ZFS_DEBUG_DPRINTF) { \
char *__blkbuf = kmem_alloc(BP_SPRINTF_LEN, KM_SLEEP); \
- sprintf_blkptr(__blkbuf, (bp));\
+ snprintf_blkptr(__blkbuf, BP_SPRINTF_LEN, (bp));\
dprintf(fmt %s\n, __VA_ARGS__, __blkbuf); \
kmem_free(__blkbuf, BP_SPRINTF_LEN); \
} \
CVS commit: src/external/cddl/osnet/dist
Module Name:src
Committed By: ozaki-r
Date: Fri Mar 28 03:46:56 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/cmd/zdb: zdb_il.c
src/external/cddl/osnet/dist/uts/common/fs/zfs: spa_misc.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: dbuf.h spa.h
Log Message:
Complete migrating to snprintf_blkptr
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c
diff -u src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c:1.1.1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c:1.2
--- src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c:1.1.1.2 Sat Feb 27 22:29:29 2010
+++ src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c Fri Mar 28 03:46:56 2014
@@ -47,7 +47,7 @@ print_log_bp(const blkptr_t *bp, const c
{
char blkbuf[BP_SPRINTF_LEN];
- sprintf_blkptr(blkbuf, bp);
+ snprintf_blkptr(blkbuf, sizeof(blkbuf), bp);
(void) printf(%s%s\n, prefix, blkbuf);
}
@@ -313,7 +313,8 @@ print_log_block(zilog_t *zilog, blkptr_t
if (verbose = 5) {
(void) strcpy(blkbuf, , );
- sprintf_blkptr(blkbuf + strlen(blkbuf), bp);
+ snprintf_blkptr(blkbuf + strlen(blkbuf),
+ sizeof(blkbuf) - strlen(blkbuf), bp);
} else {
blkbuf[0] = '\0';
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c:1.1.1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c:1.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c:1.1.1.2 Sat Feb 27 22:31:07 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c Fri Mar 28 03:46:56 2014
@@ -1136,13 +1136,13 @@ spa_generate_guid(spa_t *spa)
}
void
-sprintf_blkptr(char *buf, const blkptr_t *bp)
+snprintf_blkptr(char *buf, size_t buflen, const blkptr_t *bp)
{
char *type = dmu_ot[BP_GET_TYPE(bp)].ot_name;
char *checksum = zio_checksum_table[BP_GET_CHECKSUM(bp)].ci_name;
char *compress = zio_compress_table[BP_GET_COMPRESS(bp)].ci_name;
- SPRINTF_BLKPTR(snprintf, ' ', buf, bp, type, checksum, compress);
+ SNPRINTF_BLKPTR(snprintf, ' ', buf, buflen, bp, type, checksum, compress);
}
void
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h:1.1.1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h:1.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h:1.1.1.2 Sat Feb 27 22:31:39 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h Fri Mar 28 03:46:56 2014
@@ -326,7 +326,7 @@ _NOTE(CONSTCOND) } while (0)
#define dprintf_dbuf_bp(db, bp, fmt, ...) do { \
if (zfs_flags ZFS_DEBUG_DPRINTF) { \
char *__blkbuf = kmem_alloc(BP_SPRINTF_LEN, KM_SLEEP); \
- sprintf_blkptr(__blkbuf, bp);\
+ snprintf_blkptr(__blkbuf, BP_SPRINTF_LEN, bp);\
dprintf_dbuf(db, fmt %s\n, __VA_ARGS__, __blkbuf); \
kmem_free(__blkbuf, BP_SPRINTF_LEN); \
} \
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h:1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h:1.3
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h:1.2 Fri Mar 28 03:18:24 2014
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h Fri Mar 28 03:46:56 2014
@@ -344,11 +344,11 @@ typedef struct blkptr {
* 'func' is either snprintf() or mdb_snprintf().
* 'ws' (whitespace) can be ' ' for single-line format, '\n' for multi-line.
*/
-#define SPRINTF_BLKPTR(func, ws, buf, bp, type, checksum, compress) \
+#define SNPRINTF_BLKPTR(func, ws, buf, buflen, bp, type, checksum, compress) \
{ \
static const char *copyname[] = \
{ zero, single, double, triple }; \
- int size = BP_SPRINTF_LEN; \
+ int size = buflen; \
int len = 0; \
int copies = 0; \
\
@@ -592,7 +592,7 @@ extern char *spa_strdup(const char *);
extern void spa_strfree(char *);
extern uint64_t spa_get_random(uint64_t range);
extern uint64_t spa_generate_guid(spa_t *spa);
-extern void snprintf_blkptr(char *buf, const blkptr_t *bp);
+extern void snprintf_blkptr(char *buf, size_t buflen, const blkptr_t *bp);
extern void spa_freeze(spa_t *spa);
extern void spa_upgrade(spa_t *spa, uint64_t version);
extern void spa_evict_all(void);
CVS commit: src/sys/dev/ieee1394
Module Name:src Committed By: htodd Date: Fri Mar 28 04:09:19 UTC 2014 Modified Files: src/sys/dev/ieee1394: iec13213.h Log Message: Fix build. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ieee1394/iec13213.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ieee1394/iec13213.h diff -u src/sys/dev/ieee1394/iec13213.h:1.5 src/sys/dev/ieee1394/iec13213.h:1.6 --- src/sys/dev/ieee1394/iec13213.h:1.5 Thu Aug 26 07:36:53 2010 +++ src/sys/dev/ieee1394/iec13213.h Fri Mar 28 04:09:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: iec13213.h,v 1.5 2010/08/26 07:36:53 cegger Exp $ */ +/* $NetBSD: iec13213.h,v 1.6 2014/03/28 04:09:19 htodd Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -224,7 +224,7 @@ struct csrreg *crom_search_key(struct cr int crom_has_specver(uint32_t *, uint32_t, uint32_t); #ifndef _KERNEL -const char *crom_desc(struct crom_context *, char *, int); +const char *crom_desc(struct crom_context *, char *, size_t); #endif /* For CROM build */
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Mar 27 07:54:43 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: bzero - memset To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Mar 27 07:56:56 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Mar 27 07:59:17 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: Simplify the semaphore code a little To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src Committed By: skrll Date: Thu Mar 27 10:11:04 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_2835_arm.c Log Message: Remove #if 0'ed code. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src Committed By: skrll Date: Thu Mar 27 10:42:47 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_2835_arm.c Log Message: More #if 0'ed removal To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_2835_arm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist
Module Name:src Committed By: christos Date: Thu Mar 27 15:50:48 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c src/external/cddl/osnet/dist/cmd/zdb: zdb.c src/external/cddl/osnet/dist/cmd/ztest: ztest.c src/external/cddl/osnet/dist/lib/libdtrace/arm: dt_isadep.c src/external/cddl/osnet/dist/lib/libdtrace/common: dt_handle.c dt_link.c dt_subr.c src/external/cddl/osnet/dist/lib/libzpool/common: util.c src/external/cddl/osnet/dist/tools/ctf/cvt: merge.c src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c fasttrap.c src/external/cddl/osnet/dist/uts/common/fs/zfs: ddt.c spa.c zfs_vfsops.c zfs_znode.c zio.c zvol.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: ddt.h src/external/cddl/osnet/dist/uts/common/sys: cmn_err.h Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c cvs rdiff -u -r1.1.1.2 -r1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb.c cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/cmd/ztest/ztest.c cvs rdiff -u -r1.1 -r1.2 \ src/external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c cvs rdiff -u -r1.7 -r1.8 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/lib/libzpool/common/util.c cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c cvs rdiff -u -r1.26 -r1.27 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/dtrace/fasttrap.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/ddt.c cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c cvs rdiff -u -r1.15 -r1.16 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zio.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/ddt.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/uts/common/sys/cmn_err.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src Committed By: apb Date: Thu Mar 27 16:10:46 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/hcrypto: engine.c md2.c src/crypto/external/bsd/heimdal/dist/lib/kadm5: ad.c src/crypto/external/bsd/heimdal/dist/lib/krb5: test_pknistkdf.c Log Message: Fix sizeof errors in memset calls in heimdal. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c \ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src Committed By: apb Date: Thu Mar 27 16:26:22 UTC 2014 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: rnd_keys.c Log Message: sizeof(array - 1) decays to sizeof(pointer), but (sizeof(array) - 1) was actually wanted. The effect of this bug is that only a few bytes of the hostname are mixed into the random seed, instead of using the entire hostname. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/rnd_keys.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/cdrom/macppc_installboot
Module Name:src Committed By: apb Date: Thu Mar 27 16:34:37 UTC 2014 Modified Files: src/distrib/cdrom/macppc_installboot: installboot.c Log Message: Use calloc instead of malloc + memset. This fixes a bug in which the wrong size was passed to memset. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/cdrom/macppc_installboot/installboot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Thu Mar 27 17:31:56 UTC 2014 Modified Files: src/sys/fs/ptyfs: ptyfs_subr.c ptyfs_vfsops.c src/sys/kern: tty_bsdpty.c tty_ptm.c tty_pty.c src/sys/sys: pty.h Log Message: From Ilya Zykov: - ifdef out some code that is only used for NO_DEV_PTM - pass the mountpoint instead of the ptm structure to the implementation dependent (ptyfs or bsdpty) functions. - add a function to return the correct ptyfs mountpoint for the current lwp To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/fs/ptyfs/ptyfs_subr.c cvs rdiff -u -r1.47 -r1.48 src/sys/fs/ptyfs/ptyfs_vfsops.c cvs rdiff -u -r1.18 -r1.19 src/sys/kern/tty_bsdpty.c cvs rdiff -u -r1.30 -r1.31 src/sys/kern/tty_ptm.c cvs rdiff -u -r1.135 -r1.136 src/sys/kern/tty_pty.c cvs rdiff -u -r1.8 -r1.9 src/sys/sys/pty.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: christos Date: Thu Mar 27 18:22:56 UTC 2014 Modified Files: src/sys/arch/dreamcast/dev/maple: maple.c src/sys/arch/ia64/disasm: disasm_format.c src/sys/arch/ia64/stand/efi/libefi: devicename.c src/sys/arch/ia64/stand/ia64/ski: devicename.c src/sys/arch/next68k/dev: esp.c src/sys/arch/prep/prep: autoconf.c residual.c src/sys/arch/sparc/sparc: cpu.c src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/arch/x86/x86: est.c odcm.c procfs_machdep.c src/sys/arch/xen/xen: pciback.c src/sys/arch/xen/xenbus: xenbus_client.c Log Message: correct/add protection against snprintf overflow. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/dreamcast/dev/maple/maple.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/disasm/disasm_format.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/efi/libefi/devicename.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/devicename.c cvs rdiff -u -r1.61 -r1.62 src/sys/arch/next68k/dev/esp.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/prep/prep/autoconf.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/prep/prep/residual.c cvs rdiff -u -r1.242 -r1.243 src/sys/arch/sparc/sparc/cpu.c cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/x86/est.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/odcm.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/x86/procfs_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/xen/pciback.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/xen/xenbus/xenbus_client.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/filemon
Module Name:src Committed By: christos Date: Thu Mar 27 18:27:34 UTC 2014 Modified Files: src/sys/dev/filemon: filemon.c filemon.h filemon_wrapper.c Log Message: remove a bunch of repetitive code by introducing filemon_printf. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/filemon/filemon.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/filemon/filemon.h \ src/sys/dev/filemon/filemon_wrapper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Thu Mar 27 18:28:26 UTC 2014 Modified Files: src/sys/dev/ic: aic79xx.c aic7xxx.c mpt_debug.c Log Message: cleanup debugging printfs to avoid overflow To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/aic79xx.c cvs rdiff -u -r1.130 -r1.131 src/sys/dev/ic/aic7xxx.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/mpt_debug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: apb Date: Thu Mar 27 19:34:39 UTC 2014 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_printf.c Log Message: format is a pointer, so sizeof(format) is not a good length to pass to snprintf. Try to calculate the correct length, taking into account the amount of space already used. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Mar 27 21:09:33 UTC 2014 Modified Files: src/sys/kern: kern_sysctl.c Log Message: explain how a printf might happen (since it has bitten more than one person) To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.249 src/sys/kern/kern_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Thu Mar 27 21:11:11 UTC 2014 Modified Files: src/sys/arch/arm/include [matt-nb5-mips64]: param.h Log Message: #define ALIGNBYTES __ALIGNBYTES To generate a diff of this commit: cvs rdiff -u -r1.12.12.3 -r1.12.12.4 src/sys/arch/arm/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/ptyfs
Module Name:src Committed By: christos Date: Thu Mar 27 21:13:06 UTC 2014 Modified Files: src/sys/fs/ptyfs: ptyfs_vnops.c Log Message: forgot to commit one patch: Avoid returning released(free), but still hashed inode numbers. (Ilya Zykov) To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/fs/ptyfs/ptyfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: christos Date: Thu Mar 27 21:21:47 UTC 2014 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: add missing dependencies (Takahiro HAYASHI) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface
Module Name:src Committed By: skrll Date: Thu Mar 27 23:03:07 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h src/sys/external/bsd/vchiq/dist/interface/vchi: vchi_cfg.h src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_arm.c vchiq_core.c vchiq_core.h vchiq_if.h vchiq_ioctl.h vchiq_kern_lib.c vchiq_shim.c vchiq_util.c Log Message: Merge upstream fixes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/vchiq/dist/interface/vchi/vchi_cfg.h cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_shim.c cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_if.h \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_ioctl.h \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/arm/cortex
Module Name:src Committed By: matt Date: Thu Mar 27 23:21:36 UTC 2014 Modified Files: src/sys/arch/arm/cortex [matt-nb5-mips64]: a9_mpsubr.S Log Message: Don't = since that isn't BE8 friendly To generate a diff of this commit: cvs rdiff -u -r1.12.2.5 -r1.12.2.6 src/sys/arch/arm/cortex/a9_mpsubr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/iscsi
Module Name:src Committed By: christos Date: Fri Mar 28 02:15:56 UTC 2014 Modified Files: src/sys/dev/iscsi: iscsi_text.c Log Message: avoid buffer overflow To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/iscsi/iscsi_text.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ieee1394
Module Name:src Committed By: christos Date: Fri Mar 28 02:16:47 UTC 2014 Modified Files: src/sys/dev/ieee1394: fwcrom.c Log Message: Deal with snprintf more gracefully. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ieee1394/fwcrom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 02:50:18 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/zdb: zdb.c src/external/cddl/osnet/dist/cmd/ztest: ztest.c src/external/cddl/osnet/dist/lib/libzpool/common: util.c src/external/cddl/osnet/sys/sys: zfs_context.h Log Message: Add missing 3rd argument of nicenum To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/cmd/zdb/zdb.c cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/cmd/ztest/ztest.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/lib/libzpool/common/util.c cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/sys/sys/zfs_context.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 02:58:36 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c src/external/cddl/osnet/dist/cmd/zdb: zdb.c src/external/cddl/osnet/dist/cmd/ztest: ztest.c src/external/cddl/osnet/dist/lib/libdtrace/common: dt_link.c Log Message: Fix some snprintf To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/cmd/zdb/zdb.c cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dist/cmd/ztest/ztest.c cvs rdiff -u -r1.5 -r1.6 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/cmd/zdb
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 03:11:00 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/zdb: zdb.c Log Message: Add missing 4th argument of ddt_object_name To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/cmd/zdb/zdb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 03:18:24 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/zdb: zdb.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: spa.h Log Message: Fix migrating to snprintf_blkptr To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/cmd/zdb/zdb.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 03:46:56 UTC 2014 Modified Files: src/external/cddl/osnet/dist/cmd/zdb: zdb_il.c src/external/cddl/osnet/dist/uts/common/fs/zfs: spa_misc.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: dbuf.h spa.h Log Message: Complete migrating to snprintf_blkptr To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ieee1394
Module Name:src Committed By: htodd Date: Fri Mar 28 04:09:19 UTC 2014 Modified Files: src/sys/dev/ieee1394: iec13213.h Log Message: Fix build. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ieee1394/iec13213.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
