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

Correct the behavior of ndis_adjust_buflen(): the NDIS spec says

Browse Source 
it's an error to set the buffer bytecount to anything larger than
the buffer's original allocation size, but anything less than that
is ok.

Also, in ndis_ptom(), use the same logic: if the bytecount is
larger than the allocation size, consider the bytecount invalid
and the allocation size as the packet fragment length (m_len)
instead of the bytecount.

This corrects a consistency problem between the Broadcom wireless
driver and some of the ethernet drivers I've tested: the ethernet
drivers all report the packet frag sizes in buf->nb_bytecount, but
the Broadcom wireless driver reports them in buf->nb_size. This
seems like a bug to me, but it clearly must work in Windows, so
we have to deal with it here too.
This commit is contained in:
Bill Paul 2003-12-12 08:54:48 +00:00
parent cac77d0422
commit 8f0387a278
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/ndis/kern_ndis.c
View File

@ -464,7 +464,7 @@ ndis_ptom(m0, p)
* set up the free mechanism in the first mbuf of the
* chain.
*/
if (buf->nb_size)
if (buf->nb_bytecount > buf->nb_size)
m->m_len = buf->nb_size;
else
m->m_len = buf->nb_bytecount;

13
sys/compat/ndis/subr_ndis.c
View File

@ -467,6 +467,11 @@ ndis_read_cfg(status, parm, cfg, key, type)
TAILQ_FOREACH(e, &sc->ndis_ctx, link) {
oidp = e->entry;
if (strcmp(oidp->oid_name, keystr) == 0) {
if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) {
free(keystr, M_DEVBUF);
*status = NDIS_STATUS_FAILURE;
return;
}
*status = ndis_encode_parm(block, oidp, type, parm);
free(keystr, M_DEVBUF);
return;
@ -486,9 +491,11 @@ ndis_read_cfg(status, parm, cfg, key, type)
*/
if (type == ndis_parm_int || type == ndis_parm_hexint)
ndis_add_sysctl(sc, keystr, NULL, "0", CTLFLAG_RW);
ndis_add_sysctl(sc, keystr, "(dynamic integer key)",
"UNSET", CTLFLAG_RW);
else
ndis_add_sysctl(sc, keystr, NULL, "", CTLFLAG_RW);
ndis_add_sysctl(sc, keystr, "(dynamic string key)",
"UNSET", CTLFLAG_RW);
free(keystr, M_DEVBUF);
*status = NDIS_STATUS_FAILURE;
@ -1502,7 +1509,7 @@ ndis_adjust_buflen(buf, len)
ndis_buffer *buf;
int len;
{
if (buf->nb_bytecount > len)
if (len > buf->nb_size)
return;
buf->nb_bytecount = len;