projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'anonvma'
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
llc
/
llc_conn.c
diff --git
a/net/llc/llc_conn.c
b/net/llc/llc_conn.c
index
a8dde9b
..
ba137a6
100644
(file)
--- a/
net/llc/llc_conn.c
+++ b/
net/llc/llc_conn.c
@@
-13,6
+13,7
@@
*/
#include <linux/init.h>
*/
#include <linux/init.h>
+#include <linux/slab.h>
#include <net/llc_sap.h>
#include <net/llc_conn.h>
#include <net/sock.h>
#include <net/llc_sap.h>
#include <net/llc_conn.h>
#include <net/sock.h>
@@
-827,7
+828,8
@@
void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
else {
dprintk("%s: adding to backlog...\n", __func__);
llc_set_backlog_type(skb, LLC_PACKET);
else {
dprintk("%s: adding to backlog...\n", __func__);
llc_set_backlog_type(skb, LLC_PACKET);
- sk_add_backlog(sk, skb);
+ if (sk_add_backlog(sk, skb))
+ goto drop_unlock;
}
out:
bh_unlock_sock(sk);
}
out:
bh_unlock_sock(sk);