All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, Jon Maloy <jon.maloy@ericsson.com>,
	Ying Xue <ying.xue@windriver.com>,
	Erik Hugne <erik.hugne@ericsson.com>,
	Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH net-next 15/16] tipc: fix wrong return value for link_send_sections_long routine
Date: Mon, 17 Jun 2013 10:54:50 -0400	[thread overview]
Message-ID: <1371480891-5264-16-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1371480891-5264-1-git-send-email-paul.gortmaker@windriver.com>

From: Ying Xue <ying.xue@windriver.com>

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>
---
 net/tipc/link.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/tipc/link.c b/net/tipc/link.c
index b6ffa9f..0cc3d90 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;
-- 
1.8.1.2

  parent reply	other threads:[~2013-06-17 14:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-17 14:54 [PATCH v2 net-next 00/16] tipc: make use of kernel threads to simplify things Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 01/16] tipc: update code comments to reflect new uapi header path Paul Gortmaker
2013-06-17 17:33   ` Sergei Shtylyov
2013-06-17 14:54 ` [PATCH net-next 02/16] tipc: change socket buffer overflow control to respect sk_rcvbuf Paul Gortmaker
2013-06-17 23:55   ` Neil Horman
2013-06-17 14:54 ` [PATCH net-next 03/16] tipc: allow implicit connect for stream sockets Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 04/16] tipc: introduce new TIPC server infrastructure Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 05/16] tipc: convert topology server to use new server facility Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 06/16] tipc: convert configuration " Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 07/16] tipc: delete code orphaned by new server infrastructure Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 08/16] tipc: remove user_port instance from tipc_port structure Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 09/16] tipc: rename tipc_createport_raw to tipc_createport Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 10/16] tipc: convert config_lock from spinlock to mutex Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 11/16] tipc: save sock structure pointer instead of void pointer to tipc_port Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 12/16] tipc: cosmetic realignment of function arguments Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 13/16] tipc: enhance priority of link protocol packet Paul Gortmaker
2013-06-17 14:54 ` [PATCH net-next 14/16] tipc: make tipc_link_send_sections_fast exit earlier Paul Gortmaker
2013-06-17 14:54 ` Paul Gortmaker [this message]
2013-06-17 14:54 ` [PATCH net-next 16/16] tipc: remove dev_base_lock use from enable_bearer Paul Gortmaker
2013-06-17 22:53 ` [PATCH v2 net-next 00/16] tipc: make use of kernel threads to simplify things David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371480891-5264-16-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=davem@davemloft.net \
    --cc=erik.hugne@ericsson.com \
    --cc=jon.maloy@ericsson.com \
    --cc=netdev@vger.kernel.org \
    --cc=ying.xue@windriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.