diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 16:59:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 16:59:46 -0700 |
| commit | ff3ea47c623276e9772cbc268471224648d5a7fe (patch) | |
| tree | ecb77b11659f85abefed71aa075d4f879a7cc116 /drivers | |
| parent | a8c725045eb2eaa6c28a5493cb193f47a5c4afe4 (diff) | |
| parent | 36485707bbd9729e0c52315b173aeed9bc2303dd (diff) | |
| download | kernel_samsung_smdk4412-ff3ea47c623276e9772cbc268471224648d5a7fe.zip kernel_samsung_smdk4412-ff3ea47c623276e9772cbc268471224648d5a7fe.tar.gz kernel_samsung_smdk4412-ff3ea47c623276e9772cbc268471224648d5a7fe.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: fix locking and memory leak in br_add_bridge
[IRDA]: Missing allocation result check in irlap_change_speed().
[PPPOE]: Missing result check in __pppoe_xmit().
[NET]: Eliminate unused /proc/sys/net/ethernet
[NETCONSOLE]: Clean up initcall warning.
[TCP]: Avoid skb_pull if possible when trimming head
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/netconsole.c | 2 | ||||
| -rw-r--r-- | drivers/net/pppoe.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 66e74f7..bf58db2 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -107,7 +107,7 @@ static int init_netconsole(void) if(!configured) { printk("netconsole: not configured, aborting\n"); - return -EINVAL; + return 0; } if(netpoll_setup(&np)) diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 475dc93..0d101a1 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) * give dev_queue_xmit something it can free. */ skb2 = skb_clone(skb, GFP_ATOMIC); + + if (skb2 == NULL) + goto abort; } ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr)); |