diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-21 20:23:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-21 20:23:53 -0700 |
| commit | fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5 (patch) | |
| tree | b8c12edf3f510170cece6e9cf5337094af3095f2 /net/qrtr | |
| parent | 1f4407e2548827e3e6e7b943640a2da90c611306 (diff) | |
| parent | 94836ecf1e7378b64d37624fbb81fe48fbd4c772 (diff) | |
| download | linux-stable-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.tar.gz linux-stable-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.tar.bz2 linux-stable-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Both conflict were simple overlapping changes.
In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/qrtr')
| -rw-r--r-- | net/qrtr/qrtr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index c36b0ec364a4..a9a8c7d5a4a9 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -658,7 +658,9 @@ static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) } if (plen != len) { - skb_pad(skb, plen - len); + rc = skb_pad(skb, plen - len); + if (rc) + goto out_node; skb_put(skb, plen - len); } |