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

Change queue overflow checks from DIAGNOSTIC+panic() to KASSERT() to make

Browse Source 
them enabled on HEAD by default. It is probably better to do single compare
then hunt for unexpected memory corruption.
This commit is contained in:
Alexander Motin 2012-09-28 12:13:34 +00:00
parent 960b5a7080
commit d6e285946d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=241028
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/cam/cam_queue.c
View File

@ -121,11 +121,9 @@ camq_resize(struct camq *queue, int new_size)
{
cam_pinfo **new_array;
#ifdef DIAGNOSTIC
if (new_size < queue->entries)
panic("camq_resize: New queue size can't accomodate "
"queued entries.");
#endif
KASSERT(new_size >= queue->entries, ("camq_resize: "
"New queue size can't accomodate queued entries (%d < %d).",
new_size, queue->entries));
new_array = (cam_pinfo **)malloc(new_size * sizeof(cam_pinfo *),
M_CAMQ, M_NOWAIT);
if (new_array == NULL) {
@ -156,10 +154,10 @@ camq_resize(struct camq *queue, int new_size)
void
camq_insert(struct camq *queue, cam_pinfo *new_entry)
{
#ifdef DIAGNOSTIC
if (queue->entries >= queue->array_size)
panic("camq_insert: Attempt to insert into a full queue");
#endif
KASSERT(queue->entries < queue->array_size,
("camq_insert: Attempt to insert into a full queue (%d >= %d)",
queue->entries, queue->array_size));
queue->entries++;
queue->queue_array[queue->entries] = new_entry;
new_entry->index = queue->entries;