summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2013-06-17 10:54:50 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-17 15:53:01 -0700
commit126c0524648631a0f6fba4d016586b236209fe6f (patch)
tree23e9ee7556a92759320ed661007719272b4deb8f /net/tipc
parent7410f967ba9bdc14b1e336e5d235929ed878cbfc (diff)
downloadlinux-126c0524648631a0f6fba4d016586b236209fe6f.tar.gz
linux-126c0524648631a0f6fba4d016586b236209fe6f.tar.bz2
linux-126c0524648631a0f6fba4d016586b236209fe6f.zip
tipc: fix wrong return value for link_send_sections_long routine
When skb buffer cannot be allocated in link_send_sections_long(), -ENOMEM error code instead of -EFAULT should be returned to its caller. Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/link.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index b6ffa9fab244..0cc3d9015c5d 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1168,6 +1168,7 @@ static int link_send_sections_long(struct tipc_port *sender,
const unchar *sect_crs;
int curr_sect;
u32 fragm_no;
+ int res = 0;
again:
fragm_no = 1;
@@ -1215,12 +1216,13 @@ again:
sz = fragm_rest;
if (copy_from_user(buf->data + fragm_crs, sect_crs, sz)) {
+ res = -EFAULT;
error:
for (; buf_chain; buf_chain = buf) {
buf = buf_chain->next;
kfree_skb(buf_chain);
}
- return -EFAULT;
+ return res;
}
sect_crs += sz;
sect_rest -= sz;
@@ -1241,8 +1243,10 @@ error:
msg_set_fragm_no(&fragm_hdr, ++fragm_no);
prev = buf;
buf = tipc_buf_acquire(fragm_sz + INT_H_SIZE);
- if (!buf)
+ if (!buf) {
+ res = -ENOMEM;
goto error;
+ }
buf->next = NULL;
prev->next = buf;