← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/net/pptp.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/pptp.c
175
175
        struct pptp_opt *opt = &po->proto.pptp;
176
176
        struct pptp_gre_header *hdr;
177
177
        unsigned int header_len = sizeof(*hdr);
178
 
        int err = 0;
179
178
        int islcp;
180
179
        int len;
181
180
        unsigned char *data;
190
189
        if (sk_pppox(po)->sk_state & PPPOX_DEAD)
191
190
                goto tx_error;
192
191
 
193
 
        {
194
 
                struct flowi fl = { .oif = 0,
195
 
                        .nl_u = {
196
 
                                .ip4_u = {
197
 
                                        .daddr = opt->dst_addr.sin_addr.s_addr,
198
 
                                        .saddr = opt->src_addr.sin_addr.s_addr,
199
 
                                        .tos = RT_TOS(0) } },
200
 
                        .proto = IPPROTO_GRE };
201
 
                err = ip_route_output_key(&init_net, &rt, &fl);
202
 
                if (err)
203
 
                        goto tx_error;
204
 
        }
 
192
        rt = ip_route_output_ports(&init_net, NULL,
 
193
                                   opt->dst_addr.sin_addr.s_addr,
 
194
                                   opt->src_addr.sin_addr.s_addr,
 
195
                                   0, 0, IPPROTO_GRE,
 
196
                                   RT_TOS(0), 0);
 
197
        if (IS_ERR(rt))
 
198
                goto tx_error;
 
199
 
205
200
        tdev = rt->dst.dev;
206
201
 
207
202
        max_headroom = LL_RESERVED_SPACE(tdev) + sizeof(*iph) + sizeof(*hdr) + 2;
468
463
        po->chan.private = sk;
469
464
        po->chan.ops = &pptp_chan_ops;
470
465
 
471
 
        {
472
 
                struct flowi fl = {
473
 
                        .nl_u = {
474
 
                                .ip4_u = {
475
 
                                        .daddr = opt->dst_addr.sin_addr.s_addr,
476
 
                                        .saddr = opt->src_addr.sin_addr.s_addr,
477
 
                                        .tos = RT_CONN_FLAGS(sk) } },
478
 
                        .proto = IPPROTO_GRE };
479
 
                security_sk_classify_flow(sk, &fl);
480
 
                if (ip_route_output_key(&init_net, &rt, &fl)) {
481
 
                        error = -EHOSTUNREACH;
482
 
                        goto end;
483
 
                }
484
 
                sk_setup_caps(sk, &rt->dst);
 
466
        rt = ip_route_output_ports(&init_net, sk,
 
467
                                   opt->dst_addr.sin_addr.s_addr,
 
468
                                   opt->src_addr.sin_addr.s_addr,
 
469
                                   0, 0,
 
470
                                   IPPROTO_GRE, RT_CONN_FLAGS(sk), 0);
 
471
        if (IS_ERR(rt)) {
 
472
                error = -EHOSTUNREACH;
 
473
                goto end;
485
474
        }
 
475
        sk_setup_caps(sk, &rt->dst);
 
476
 
486
477
        po->chan.mtu = dst_mtu(&rt->dst);
487
478
        if (!po->chan.mtu)
488
479
                po->chan.mtu = PPP_MTU;