Skip to content
  1. Aug 01, 2014
  2. Jul 31, 2014
    • Anatol Pomozov's avatar
      Bluetooth: Fix crash in the Marvell driver initialization codepath · 8500d791
      Anatol Pomozov authored
      
      
      btmrvl_add_card() function calls kthread_run that might return error
      (e.g. if current thread is killed). If one tries to use the error
      value as a pointer then invalid memory access oops happens.
      
      Check kthread_run() return value, if it is an error then release resources
      correctly.
      
      TEST=boot computer with BT modules enabled. I see the error message that
      BT device initialization failed. Now kernel does not crash. Hint: to enable
      BT run 'rmmod btmrvl_sdio; modprobe btmrvl_sdio'
      
      Signed-off-by: default avatarAnatol Pomozov <anatol.pomozov@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      8500d791
    • Johan Hedberg's avatar
      Bluetooth: Always use non-bonding requirement when not bondable · 82c295b1
      Johan Hedberg authored
      
      
      When we're not bondable we should never send any other SSP
      authentication requirement besides one of the non-bonding ones.
      
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      82c295b1
    • Johan Hedberg's avatar
      Bluetooth: Rename pairable mgmt setting to bondable · b2939475
      Johan Hedberg authored
      
      
      This setting maps to the HCI_BONDABLE flag which tracks whether we're
      bondable or not. Therefore, rename the mgmt setting and respective
      command accordingly.
      
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      b2939475
    • Johan Hedberg's avatar
      Bluetooth: Rename HCI_PAIRABLE to HCI_BONDABLE · b6ae8457
      Johan Hedberg authored
      
      
      The HCI_PAIRABLE flag isn't actually controlling whether we're pairable
      but whether we're bondable. Therefore, rename it accordingly.
      
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      b6ae8457
    • Marcel Holtmann's avatar
      Bluetooth: Fix sparse warning from HID new leds handling · bdb94346
      Marcel Holtmann authored
      
      
      The new leds bit handling produces this spares warning.
      
        CHECK   net/bluetooth/hidp/core.c
      net/bluetooth/hidp/core.c:156:60: warning: dubious: x | !y
      
      Just fix it by doing an explicit x << 0 shift operation.
      
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      bdb94346
    • Johan Hedberg's avatar
      Bluetooth: Fix check for connected state when pairing · 6f78fd4b
      Johan Hedberg authored
      
      
      Both BT_CONNECTED and BT_CONFIG state mean that we have a baseband link
      available. We should therefore check for either of these when pairing
      and deciding whether to call hci_conn_security() directly.
      
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      6f78fd4b
    • Varka Bhadram's avatar
      6lowpan: remove unused function · 233351bd
      Varka Bhadram authored
      
      
      This patch removes the unused function.
      
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      233351bd
    • Varka Bhadram's avatar
      6lowpan: remove unused macros · 267ca9fe
      Varka Bhadram authored
      
      
      This patch removes the unused macros.
      
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      267ca9fe
    • Marcel Holtmann's avatar
      6lowpan: iphc: Fix parenthesis alignments which off-by-one · 3fa71fe0
      Marcel Holtmann authored
      
      
      CHECK: Alignment should match open parenthesis
      +	if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
      +	     (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
      
      CHECK: Alignment should match open parenthesis
      +		if ((hdr->priority == 0) &&
      +		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
      
      CHECK: Alignment should match open parenthesis
      +		if ((hdr->priority == 0) &&
      +		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
      
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      3fa71fe0
    • Marcel Holtmann's avatar
      6lowpan: iphc: Fix missing braces for if statement · 9ab9bb00
      Marcel Holtmann authored
      
      
      CHECK: braces {} should be used on all arms of this statement
      +	if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)
      [...]
      +	else {
      [...]
      
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      9ab9bb00
    • Marcel Holtmann's avatar
      6lowpan: iphc: Fix missing blank line after variable declarations · 26fff593
      Marcel Holtmann authored
      
      
      WARNING: Missing a blank line after declarations
      +		struct sk_buff *new;
      +		if (uncompress_udp_header(skb, &uh))
      
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      26fff593
    • Marcel Holtmann's avatar
      6lowpan: iphc: Fix issues with alignment matching open parenthesis · 7fc4cfda
      Marcel Holtmann authored
      
      
      This patch fixes all the issues with alignment matching of open
      parenthesis found by checkpatch.pl and makes them follow the
      network coding style now.
      
      CHECK: Alignment should match open parenthesis
      +static int uncompress_addr(struct sk_buff *skb,
      +				struct in6_addr *ipaddr, const u8 address_mode,
      
      CHECK: Alignment should match open parenthesis
      +static int uncompress_context_based_src_addr(struct sk_buff *skb,
      +						struct in6_addr *ipaddr,
      
      CHECK: Alignment should match open parenthesis
      +static int skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr,
      +		struct net_device *dev, skb_delivery_cb deliver_skb)
      
      CHECK: Alignment should match open parenthesis
      +	new = skb_copy_expand(skb, sizeof(struct ipv6hdr), skb_tailroom(skb),
      +								GFP_ATOMIC);
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_table(__func__, "raw skb data dump before receiving",
      +			new->data, new->len);
      
      CHECK: Alignment should match open parenthesis
      +lowpan_uncompress_multicast_daddr(struct sk_buff *skb,
      +		struct in6_addr *ipaddr,
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_inline(NULL, "Reconstructed ipv6 multicast addr is",
      +				ipaddr->s6_addr, 16);
      
      CHECK: Alignment should match open parenthesis
      +int lowpan_process_data(struct sk_buff *skb, struct net_device *dev,
      +		const u8 *saddr, const u8 saddr_type, const u8 saddr_len,
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_table(__func__, "raw skb data dump uncompressed",
      +				skb->data, skb->len);
      
      CHECK: Alignment should match open parenthesis
      +		err = uncompress_addr(skb, &hdr.saddr, tmp, saddr,
      +					saddr_type, saddr_len);
      
      CHECK: Alignment should match open parenthesis
      +		err = uncompress_addr(skb, &hdr.daddr, tmp, daddr,
      +					daddr_type, daddr_len);
      
      CHECK: Alignment should match open parenthesis
      +		pr_debug("dest: stateless compression mode %d dest %pI6c\n",
      +			tmp, &hdr.daddr);
      
      CHECK: Alignment should match open parenthesis
      +		raw_dump_table(__func__, "raw UDP header dump",
      +				      (u8 *)&uh, sizeof(uh));
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_table(__func__, "raw header dump", (u8 *)&hdr,
      +							sizeof(hdr));
      
      CHECK: Alignment should match open parenthesis
      +int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
      +			unsigned short type, const void *_daddr,
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_table(__func__, "raw skb network header dump",
      +		skb_network_header(skb), sizeof(struct ipv6hdr));
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_table(__func__,
      +			"sending raw skb network uncompressed packet",
      
      CHECK: Alignment should match open parenthesis
      +	if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
      +	     (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
      
      WARNING: quoted string split across lines
      +			pr_debug("dest address unicast link-local %pI6c "
      +				"iphc1 0x%02x\n", &hdr->daddr, iphc1);
      
      CHECK: Alignment should match open parenthesis
      +	raw_dump_table(__func__, "raw skb data dump compressed",
      +				skb->data, skb->len);
      
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      7fc4cfda
    • Marcel Holtmann's avatar
      6lowpan: iphc: Fix block comments to match networking style · 89f53490
      Marcel Holtmann authored
      
      
      This patch fixes all the block comment issues found by checkpatch.pl and
      makes them match the network style now.
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +/*
      + * Based on patches from Jon Smirl <jonsmirl@gmail.com>
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +/*
      + * Uncompress address function for source and
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +/*
      + * Uncompress address function for source context
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +		/*
      +		 * UDP lenght needs to be infered from the lower layers
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +	/*
      +	 * Traffic Class and FLow Label carried in-line
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +	/*
      +	 * Traffic class carried in-line
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +	/*
      +	 * Flow Label carried in-line
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +		/*
      +		 * replace the compressed UDP head by the uncompressed UDP
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +	/*
      +	 * As we copy some bit-length fields, in the IPHC encoding bytes,
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +	/*
      +	 * Traffic class, flow label
      
      WARNING: networking block comments don't use an empty /* line, use /* Comment...
      +	/*
      +	 * Hop limit
      
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      89f53490
    • Alexander Aring's avatar
      6lowpan: remove unused LOWPAN_FRAG_SIZE define · 00494244
      Alexander Aring authored
      This define is unused since commit
      96cb3eb7 ("6lowpan: fix fragmentation on
      sending side"). It is a worst case scenario for payload calculation.
      Since commit 96cb3eb7
      
       we calculation the
      payload to use the optimal size.
      
      This define is also necessary for ieee802154 6lowpan only and the file
      include/net/6lowpan.h should contain generic 6lowpan things only.
      
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      00494244
    • Alexander Aring's avatar
      6lowpan: iphc: remove check on null · b2e3a479
      Alexander Aring authored
      
      
      This memory is placed on stack and can't be null so remove the check on
      null.
      
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      b2e3a479
    • Alexander Aring's avatar
      6lowpan: iphc: use ipv6 api to check address scope · 556a5bfc
      Alexander Aring authored
      
      
      This patch removes the own implementation to check of link-layer,
      broadcast and any address type and use the IPv6 api for that.
      
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      556a5bfc
    • Alexander Aring's avatar
      6lowpan: iphc: cleanup use of lowpan_push_hc_data · 85c71240
      Alexander Aring authored
      
      
      This patch uses the lowpan_push_hc_data functions in several places
      where we can use it. The lowpan_push_hc_data was introduced in some
      previous patches.
      
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      85c71240
    • Alexander Aring's avatar
      6lowpan: iphc: cleanup use of lowpan_fetch_skb · 4ebc960f
      Alexander Aring authored
      
      
      We introduced the lowpan_fetch_skb function in some previous patches for
      6lowpan to have a generic fetch function. This patch drops the old
      function and use the generic lowpan_fetch_skb one.
      
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      4ebc960f
    • Alexander Aring's avatar
    • Alexander Aring's avatar
      6lowpan: iphc: rename hc06_ptr pointer to hc_ptr · 84ca5e03
      Alexander Aring authored
      
      
      The hc06_ptr pointer variable stands for header compression draft-06. We
      are mostly rfc complaint. This patch rename the variable to normal hc_ptr.
      
      Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      84ca5e03
    • Johan Hedberg's avatar
      Bluetooth: Fix SMP context tracking leading to a kernel crash · 616d55be
      Johan Hedberg authored
      
      
      The HCI_CONN_LE_SMP_PEND flag is supposed to indicate whether we have an
      SMP context or not. If the context creation fails, or some other error
      is indicated between setting the flag and creating the context the flag
      must be cleared first.
      
      This patch ensures that smp_chan_create() clears the flag in case of
      allocation failure as well as reorders code in smp_cmd_security_req()
      that could lead to returning an error between setting the flag and
      creating the context.
      
      Without the patch the following kind of kernel crash could be observed
      (this one because of unacceptable authentication requirements in a
      Security Request):
      
      [  +0.000855] kernel BUG at net/bluetooth/smp.c:606!
      [  +0.000000] invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
      [  +0.000000] CPU: 0 PID: 58 Comm: kworker/u5:2 Tainted: G        W     3.16.0-rc1+ #785
      [  +0.008391] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [  +0.000000] Workqueue: hci0 hci_rx_work
      [  +0.000000] task: f4dc8f90 ti: f4ef0000 task.ti: f4ef0000
      [  +0.000000] EIP: 0060:[<c13432b6>] EFLAGS: 00010246 CPU: 0
      [  +0.000000] EIP is at smp_chan_destroy+0x1e/0x145
      [  +0.000709] EAX: f46db870 EBX: 00000000 ECX: 00000000 EDX: 00000005
      [  +0.000000] ESI: f46db870 EDI: f46db870 EBP: f4ef1dc0 ESP: f4ef1db0
      [  +0.000000]  DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
      [  +0.000000] CR0: 8005003b CR2: b666b0b0 CR3: 00022000 CR4: 00000690
      [  +0.000000] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
      [  +0.000000] DR6: fffe0ff0 DR7: 00000400
      [  +0.000000] Stack:
      [  +0.000000]  00000005 f17b7840 f46db870 f4ef1dd4 f4ef1de4 c1343441 c134342e 00000000
      [  +0.000000]  c1343441 00000005 00000002 00000000 f17b7840 f4ef1e38 c134452a 00002aae
      [  +0.000000]  01ef1e00 00002aae f46bd980 f46db870 00000039 ffffffff 00000007 f4ef1e34
      [  +0.000000] Call Trace:
      [  +0.000000]  [<c1343441>] smp_failure+0x64/0x6c
      [  +0.000000]  [<c134342e>] ? smp_failure+0x51/0x6c
      [  +0.000000]  [<c1343441>] ? smp_failure+0x64/0x6c
      [  +0.000000]  [<c134452a>] smp_sig_channel+0xad6/0xafc
      [  +0.000000]  [<c1053b61>] ? vprintk_emit+0x343/0x366
      [  +0.000000]  [<c133f34e>] l2cap_recv_frame+0x1337/0x1ac4
      [  +0.000000]  [<c133f34e>] ? l2cap_recv_frame+0x1337/0x1ac4
      [  +0.000000]  [<c1172307>] ? __dynamic_pr_debug+0x3e/0x40
      [  +0.000000]  [<c11702a1>] ? debug_smp_processor_id+0x12/0x14
      [  +0.000000]  [<c1340bc9>] l2cap_recv_acldata+0xe8/0x239
      [  +0.000000]  [<c1340bc9>] ? l2cap_recv_acldata+0xe8/0x239
      [  +0.000000]  [<c1169931>] ? __const_udelay+0x1a/0x1c
      [  +0.000000]  [<c131f120>] hci_rx_work+0x1a1/0x286
      [  +0.000000]  [<c137244e>] ? mutex_unlock+0x8/0xa
      [  +0.000000]  [<c131f120>] ? hci_rx_work+0x1a1/0x286
      [  +0.000000]  [<c1038fe5>] process_one_work+0x128/0x1df
      [  +0.000000]  [<c1038fe5>] ? process_one_work+0x128/0x1df
      [  +0.000000]  [<c10392df>] worker_thread+0x222/0x2de
      [  +0.000000]  [<c10390bd>] ? process_scheduled_works+0x21/0x21
      [  +0.000000]  [<c103d34c>] kthread+0x82/0x87
      [  +0.000000]  [<c1040000>] ? create_new_namespaces+0x90/0x105
      [  +0.000000]  [<c13738e1>] ret_from_kernel_thread+0x21/0x30
      [  +0.000000]  [<c103d2ca>] ? __kthread_parkme+0x50/0x50
      [  +0.000000] Code: 65 f4 89 f0 5b 5e 5f 5d 8d 67 f8 5f c3 57 8d 7c 24 08 83 e4 f8 ff 77 fc 55 89 e5 57 89 c7 56 53 52 8b 98 e0 00 00 00 85 db 75 02 <0f> 0b 8b b3 80 00 00 00 8b 00 c1 ee 03 83 e6 01 89 f2 e8 ef 09
      [  +0.000000] EIP: [<c13432b6>] smp_chan_destroy+0x1e/0x145 SS:ESP 0068:f4ef1db0
      
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      616d55be
  3. Jul 29, 2014