summaryrefslogtreecommitdiffstats
path: root/net/strparser
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2016-10-06 15:41:49 +0200
committerDavid S. Miller <davem@davemloft.net>2016-10-12 07:51:49 +0200
commit6d3a4c404648e415e7d96e285d723936d4df7ed0 (patch)
tree3f99b17ecba4fc4c7d35fb786e524d20134fcea9 /net/strparser
parentMerge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux (diff)
downloadlinux-6d3a4c404648e415e7d96e285d723936d4df7ed0.tar.xz
linux-6d3a4c404648e415e7d96e285d723936d4df7ed0.zip
strparser: Propagate correct error code in strp_recv()
With m68k-linux-gnu-gcc-4.1: net/strparser/strparser.c: In function ‘strp_recv’: net/strparser/strparser.c:98: warning: ‘err’ may be used uninitialized in this function Pass "len" (which is an error code when negative) instead of the uninitialized "err" variable to fix this. Fixes: 43a0c6751a322847 ("strparser: Stream parser for messages") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/strparser')
-rw-r--r--net/strparser/strparser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index 5c7549b5b92c..41adf362936d 100644
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -246,7 +246,7 @@ static int strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
} else {
strp->rx_interrupted = 1;
}
- strp_parser_err(strp, err, desc);
+ strp_parser_err(strp, len, desc);
break;
} else if (len > strp->sk->sk_rcvbuf) {
/* Message length exceeds maximum allowed */