Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-12-21 15:06:20 -08:00
parent 64935310f2 6cafab50ee
commit ce28bb4453
63 changed files with 777 additions and 637 deletions
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -94,6 +94,9 @@ int sk_msg_clone(struct sock *sk, struct sk_msg *dst, struct sk_msg *src,
 	}

 	while (len) {
+		if (sk_msg_full(dst))
+			return -ENOSPC;
+
 		sge_len = sge->length - off;
 		sge_off = sge->offset + off;
 		if (sge_len > len)