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

- Use uint16_t to pass argument for NGM_NETFLOW_IFINFO, bump cookie.

Browse Source 
- Always check that index number passed from userland
  is <= NG_NETFLOW_MAXIFACES. [1]
- Increase NG_NETFLOW_MAXIFACES up to 512. [2]

Noticed by:	Roman Palagin [1]
Requested by:	Yuri Y. Bushmelev [2]
MFC after:	1 week
This commit is contained in:
glebius 2004-12-05 14:30:38 +00:00
parent 4fb260fff1
commit db241f6ae3
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netgraph/netflow/ng_netflow.c
View File

@ -114,7 +114,7 @@ static const struct ng_cmdlist ng_netflow_cmds[] = {
NGM_NETFLOW_COOKIE,
NGM_NETFLOW_IFINFO,
"ifinfo",
&ng_parse_uint8_type,
&ng_parse_uint16_type,
&ng_netflow_ifinfo_type
},
{
@ -277,12 +277,14 @@ ng_netflow_rcvmsg (node_p node, item_p item, hook_p lasthook)
case NGM_NETFLOW_IFINFO:
{
struct ng_netflow_ifinfo *i;
const uint8_t *index;
const uint16_t *index;
if (msg->header.arglen != sizeof(uint8_t))
if (msg->header.arglen != sizeof(uint16_t))
ERROUT(EINVAL);
index = (uint8_t *)msg->data;
index = (uint16_t *)msg->data;
if (*index > NG_NETFLOW_MAXIFACES)
ERROUT(EINVAL);
/* connected iface? */
if (priv->ifaces[*index].hook == NULL)
@ -305,6 +307,8 @@ ng_netflow_rcvmsg (node_p node, item_p item, hook_p lasthook)
ERROUT(EINVAL);
set = (struct ng_netflow_setdlt *)msg->data;
if (set->iface > NG_NETFLOW_MAXIFACES)
ERROUT(EINVAL);
iface = &priv->ifaces[set->iface];
/* connected iface? */
@ -332,6 +336,8 @@ ng_netflow_rcvmsg (node_p node, item_p item, hook_p lasthook)
ERROUT(EINVAL);
set = (struct ng_netflow_setifindex *)msg->data;
if (set->iface > NG_NETFLOW_MAXIFACES)
ERROUT(EINVAL);
iface = &priv->ifaces[set->iface];
/* connected iface? */

4
sys/netgraph/netflow/ng_netflow.h
View File

@ -32,9 +32,9 @@
#define _NG_NETFLOW_H_
#define NG_NETFLOW_NODE_TYPE "netflow"
#define NGM_NETFLOW_COOKIE 1095355665
#define NGM_NETFLOW_COOKIE 1101814790
#define NG_NETFLOW_MAXIFACES 64
#define NG_NETFLOW_MAXIFACES 512
/* Hook names */