diff options
| author |   Eric Dumazet <edumazet@google.com> | 2016-02-04 06:23:28 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-13 05:57:39 -0500 |
| commit | 919483096bfe75dda338e98d56da91a263746a0a (patch) | |
| tree | f7b3a3af7c789efb21850da66bde661e06445d81 /net/ipv4/ip_sockglue.c | |
| parent | net: mvpp2: Return correct error codes (diff) | |
| download | linux-dev-919483096bfe75dda338e98d56da91a263746a0a.tar.xz linux-dev-919483096bfe75dda338e98d56da91a263746a0a.zip | |
ipv4: fix memory leaks in ip_cmsg_send() callers
Dmitry reported memory leaks of IP options allocated in
ip_cmsg_send() when/if this function returns an error.
Callers are responsible for the freeing.
Many thanks to Dmitry for the report and diagnostic.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 5f73a7c03e27..a50124260f5a 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -249,6 +249,8 @@ int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc, switch (cmsg->cmsg_type) { case IP_RETOPTS: err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)); + + /* Our caller is responsible for freeing ipc->opt */ err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40); if (err) |