~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: 0.3.0~beta3~~iwj1
[secnet]
/
netlink.c
diff --git
a/netlink.c
b/netlink.c
index
5d586d0
..
af6434f
100644
(file)
--- a/
netlink.c
+++ b/
netlink.c
@@
-238,7
+238,7
@@
static struct icmphdr *netlink_icmp_tmpl(struct netlink *st,
struct icmphdr *h;
BUF_ALLOC(&st->icmp,"netlink_icmp_tmpl");
struct icmphdr *h;
BUF_ALLOC(&st->icmp,"netlink_icmp_tmpl");
- buffer_init(&st->icmp,
st->max_start_pad
);
+ buffer_init(&st->icmp,
calculate_max_start_pad()
);
h=buf_append(&st->icmp,sizeof(*h));
h->iph.version=4;
h=buf_append(&st->icmp,sizeof(*h));
h->iph.version=4;
@@
-293,6
+293,7
@@
static bool_t netlink_icmp_may_reply(struct buffer_if *buf)
struct icmphdr *icmph;
uint32_t source;
struct icmphdr *icmph;
uint32_t source;
+ if (buf->size < (int)sizeof(struct icmphdr)) return False;
iph=(struct iphdr *)buf->start;
icmph=(struct icmphdr *)buf->start;
if (iph->protocol==1) {
iph=(struct iphdr *)buf->start;
icmph=(struct icmphdr *)buf->start;
if (iph->protocol==1) {
@@
-338,6
+339,7
@@
static bool_t netlink_icmp_may_reply(struct buffer_if *buf)
*/
static uint16_t netlink_icmp_reply_len(struct buffer_if *buf)
{
*/
static uint16_t netlink_icmp_reply_len(struct buffer_if *buf)
{
+ if (buf->size < (int)sizeof(struct iphdr)) return 0;
struct iphdr *iph=(struct iphdr *)buf->start;
uint16_t hlen,plen;
struct iphdr *iph=(struct iphdr *)buf->start;
uint16_t hlen,plen;
@@
-354,11
+356,11
@@
static void netlink_icmp_simple(struct netlink *st, struct buffer_if *buf,
struct netlink_client *client,
uint8_t type, uint8_t code)
{
struct netlink_client *client,
uint8_t type, uint8_t code)
{
- struct iphdr *iph=(struct iphdr *)buf->start;
struct icmphdr *h;
uint16_t len;
if (netlink_icmp_may_reply(buf)) {
struct icmphdr *h;
uint16_t len;
if (netlink_icmp_may_reply(buf)) {
+ struct iphdr *iph=(struct iphdr *)buf->start;
len=netlink_icmp_reply_len(buf);
h=netlink_icmp_tmpl(st,ntohl(iph->saddr),len);
h->type=type; h->code=code;
len=netlink_icmp_reply_len(buf);
h=netlink_icmp_tmpl(st,ntohl(iph->saddr),len);
h->type=type; h->code=code;
@@
-389,6
+391,7
@@
static bool_t netlink_check(struct netlink *st, struct buffer_if *buf,
return False; \
}while(0)
return False; \
}while(0)
+ if (buf->size < (int)sizeof(struct iphdr)) BAD("len %"PRIu32"",buf->size);
struct iphdr *iph=(struct iphdr *)buf->start;
int32_t len;
struct iphdr *iph=(struct iphdr *)buf->start;
int32_t len;
@@
-413,6
+416,13
@@
static void netlink_packet_deliver(struct netlink *st,
struct netlink_client *client,
struct buffer_if *buf)
{
struct netlink_client *client,
struct buffer_if *buf)
{
+ if (buf->size < (int)sizeof(struct iphdr)) {
+ Message(M_ERR,"%s: trying to deliver a too-short packet"
+ " from %s!\n",st->name, client?client->name:"(local)");
+ BUF_FREE(buf);
+ return;
+ }
+
struct iphdr *iph=(struct iphdr *)buf->start;
uint32_t dest=ntohl(iph->daddr);
uint32_t source=ntohl(iph->saddr);
struct iphdr *iph=(struct iphdr *)buf->start;
uint32_t dest=ntohl(iph->daddr);
uint32_t source=ntohl(iph->saddr);
@@
-530,6
+540,7
@@
static void netlink_packet_forward(struct netlink *st,
struct netlink_client *client,
struct buffer_if *buf)
{
struct netlink_client *client,
struct buffer_if *buf)
{
+ if (buf->size < (int)sizeof(struct iphdr)) return;
struct iphdr *iph=(struct iphdr *)buf->start;
BUF_ASSERT_USED(buf);
struct iphdr *iph=(struct iphdr *)buf->start;
BUF_ASSERT_USED(buf);
@@
-559,6
+570,12
@@
static void netlink_packet_local(struct netlink *st,
st->localcount++;
st->localcount++;
+ if (buf->size < (int)sizeof(struct icmphdr)) {
+ Message(M_WARNING,"%s: short packet addressed to secnet; "
+ "ignoring it\n",st->name);
+ BUF_FREE(buf);
+ return;
+ }
h=(struct icmphdr *)buf->start;
if ((ntohs(h->iph.frag_off)&0xbfff)!=0) {
h=(struct icmphdr *)buf->start;
if ((ntohs(h->iph.frag_off)&0xbfff)!=0) {
@@
-603,15
+620,18
@@
static void netlink_incoming(struct netlink *st, struct netlink_client *client,
uint32_t source,dest;
struct iphdr *iph;
char errmsgbuf[50];
uint32_t source,dest;
struct iphdr *iph;
char errmsgbuf[50];
+ const char *sourcedesc=client?client->name:"host";
BUF_ASSERT_USED(buf);
BUF_ASSERT_USED(buf);
+
if (!netlink_check(st,buf,errmsgbuf,sizeof(errmsgbuf))) {
Message(M_WARNING,"%s: bad IP packet from %s: %s\n",
if (!netlink_check(st,buf,errmsgbuf,sizeof(errmsgbuf))) {
Message(M_WARNING,"%s: bad IP packet from %s: %s\n",
- st->name,
client?client->name:"host"
,
+ st->name,
sourcedesc
,
errmsgbuf);
BUF_FREE(buf);
return;
}
errmsgbuf);
BUF_FREE(buf);
return;
}
+ assert(buf->size >= (int)sizeof(struct icmphdr));
iph=(struct iphdr *)buf->start;
source=ntohl(iph->saddr);
iph=(struct iphdr *)buf->start;
source=ntohl(iph->saddr);
@@
-808,12
+828,10
@@
static void netlink_inst_set_mtu(void *sst, int32_t new_mtu)
}
static void netlink_inst_reg(void *sst, netlink_deliver_fn *deliver,
}
static void netlink_inst_reg(void *sst, netlink_deliver_fn *deliver,
- void *dst
, int32_t max_start_pad
)
+ void *dst)
{
struct netlink_client *c=sst;
{
struct netlink_client *c=sst;
- struct netlink *st=c->nst;
- if (max_start_pad > st->max_start_pad) st->max_start_pad=max_start_pad;
c->deliver=deliver;
c->dst=dst;
}
c->deliver=deliver;
c->dst=dst;
}
@@
-941,7
+959,6
@@
netlink_deliver_fn *netlink_init(struct netlink *st,
st->cl.type=CL_PURE;
st->cl.apply=netlink_inst_apply;
st->cl.interface=st;
st->cl.type=CL_PURE;
st->cl.apply=netlink_inst_apply;
st->cl.interface=st;
- st->max_start_pad=0;
st->clients=NULL;
st->routes=NULL;
st->n_clients=0;
st->clients=NULL;
st->routes=NULL;
st->n_clients=0;