diff options
| -rw-r--r-- | net/ipv4/ip_options.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 251346828cb4..2f14745a9e1f 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
| @@ -513,11 +513,8 @@ void ip_options_undo(struct ip_options * opt) | |||
| 513 | 513 | ||
| 514 | static struct ip_options *ip_options_get_alloc(const int optlen) | 514 | static struct ip_options *ip_options_get_alloc(const int optlen) |
| 515 | { | 515 | { |
| 516 | struct ip_options *opt = kmalloc(sizeof(*opt) + ((optlen + 3) & ~3), | 516 | return kzalloc(sizeof(struct ip_options) + ((optlen + 3) & ~3), |
| 517 | GFP_KERNEL); | 517 | GFP_KERNEL); |
| 518 | if (opt) | ||
| 519 | memset(opt, 0, sizeof(*opt)); | ||
| 520 | return opt; | ||
| 521 | } | 518 | } |
| 522 | 519 | ||
| 523 | static int ip_options_get_finish(struct ip_options **optp, | 520 | static int ip_options_get_finish(struct ip_options **optp, |
