Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 177158
b: refs/heads/master
c: 258c889
h: refs/heads/master
v: v3
  • Loading branch information
Simon Horman authored and Patrick McHardy committed Dec 15, 2009
1 parent 5bacb59 commit 698cc3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8fa9ff6849bb86c59cc2ea9faadf3cb2d5223497
refs/heads/master: 258c889362aa95d0ab534b38ce8c15d3009705b1
4 changes: 4 additions & 0 deletions trunk/net/netfilter/ipvs/ip_vs_ctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2714,6 +2714,8 @@ static int ip_vs_genl_parse_service(struct ip_vs_service_user_kern *usvc,
if (!(nla_af && (nla_fwmark || (nla_port && nla_protocol && nla_addr))))
return -EINVAL;

memset(usvc, 0, sizeof(*usvc));

usvc->af = nla_get_u16(nla_af);
#ifdef CONFIG_IP_VS_IPV6
if (usvc->af != AF_INET && usvc->af != AF_INET6)
Expand Down Expand Up @@ -2901,6 +2903,8 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,
if (!(nla_addr && nla_port))
return -EINVAL;

memset(udest, 0, sizeof(*udest));

nla_memcpy(&udest->addr, nla_addr, sizeof(udest->addr));
udest->port = nla_get_u16(nla_port);

Expand Down

0 comments on commit 698cc3d

Please sign in to comment.