aboutsummaryrefslogtreecommitdiffstats
path: root/block
Commit message (Expand)AuthorAge
* Block: use round_jiffies_up()Alan Stern2008-11-06
* blk: move blk_delete_timer call in end_that_request_lastMike Anderson2008-11-06
* block: add timer on blkdev_dequeue_request() not elv_next_request()Tejun Heo2008-11-06
* block: remove unused ll_new_mergeable()FUJITA Tomonori2008-11-06
* Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriya...Linus Torvalds2008-10-23
|\
| * proc: move /proc/diskstats boilerplate to block/genhd.cAlexey Dobriyan2008-10-23
| * proc: move rest of /proc/partitions code to block/genhd.cAlexey Dobriyan2008-10-23
* | compat_blkdev_driver_ioctl: Remove unused variable warningLinus Torvalds2008-10-23
* | [PATCH] kill the rest of struct file propagation in block ioctlsAl Viro2008-10-21
* | [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSETAl Viro2008-10-21
* | [PATCH] get rid of blkdev_locked_ioctl()Al Viro2008-10-21
* | [PATCH] get rid of blkdev_driver_ioctl()Al Viro2008-10-21
* | [PATCH] trim file propagation in block/compat_ioctl.cAl Viro2008-10-21
* | [PATCH] end of methods switch: remove the old onesAl Viro2008-10-21
* | [PATCH] beginning of methods conversionAl Viro2008-10-21
* | [PATCH] introduce __blkdev_driver_ioctl()Al Viro2008-10-21
* | [PATCH] switch scsi_cmd_ioctl() to passing fmode_tAl Viro2008-10-21
* | [PATCH] switch sg_scsi_ioctl() to passing fmode_tAl Viro2008-10-21
* | [PATCH] pass mode instead of file to sg_io()Al Viro2008-10-21
* | [PATCH] introduce fmode_t, do annotationsAl Viro2008-10-21
|/
* Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2008-10-17
|\
| * block: remove __generic_unplug_device() from exportsJens Axboe2008-10-17
| * block: move q->unplug_work initializationPeter Zijlstra2008-10-17
| * block: fix current kernel-doc warningsRandy Dunlap2008-10-17
| * block: only call ->request_fn when the queue is not stoppedJens Axboe2008-10-17
| * block: simplify string handling in elv_iosched_store()Li Zefan2008-10-17
| * block: fix kernel-doc for blk_alloc_devt()Li Zefan2008-10-17
| * block: fix nr_phys_segments miscalculation bugFUJITA Tomonori2008-10-17
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2008-10-17
|\ \ | |/ |/|
| * [SCSI] block: separate failfast into multiple bits.Mike Christie2008-10-13
* | device create: block: convert device_create_drvdata to device_createGreg Kroah-Hartman2008-10-16
|/
* block: Switch blk_integrity_compare from bdev to gendiskMartin K. Petersen2008-10-09
* block: Fix double put in blk_integrity_unregisterMartin K. Petersen2008-10-09
* block: remove end_{queued|dequeued}_request()Kiyoshi Ueda2008-10-09
* block: change elevator to use __blk_end_request()Kiyoshi Ueda2008-10-09
* blktrace: use BLKTRACE_BDEV_SIZE as the name size for setup structureJens Axboe2008-10-09
* block: add lld busy state exporting interfaceKiyoshi Ueda2008-10-09
* block: Fix blk_start_queueing() to not kick a stopped queueElias Oltmanns2008-10-09
* block: reserve some tags just for sync IOJens Axboe2008-10-09
* block: as/cfq ssd idle check updateJens Axboe2008-10-09
* block: add queue flag for SSD/non-rotational devicesJens Axboe2008-10-09
* block: add a queue flag for request stacking supportKiyoshi Ueda2008-10-09
* block: add request submission interfaceKiyoshi Ueda2008-10-09
* block: add request update interfaceKiyoshi Ueda2008-10-09
* block: blk_cleanup_queue() should call blk_sync_queue()Jens Axboe2008-10-09
* block: use rq complete marking in blk_abort_request()Jens Axboe2008-10-09
* block: add fault injection mechanism for faking request timeoutsJens Axboe2008-10-09
* block: adjust blkdev_issue_discard for swapHugh Dickins2008-10-09
* block: Add interface to abort queued requestsMike Anderson2008-10-09
* block: unify request timeout handlingJens Axboe2008-10-09
pan> cpu_to_le16(IEEE80211_FCTL_PROTECTED); if (WARN_ON(skb_tailroom(skb) < WEP_ICV_LEN || skb_headroom(skb) < WEP_IV_LEN)) return NULL; hdrlen = ieee80211_hdrlen(hdr->frame_control); newhdr = skb_push(skb, WEP_IV_LEN); memmove(newhdr, newhdr + WEP_IV_LEN, hdrlen); /* the HW only needs room for the IV, but not the actual IV */ if (info->control.hw_key && (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) return newhdr + hdrlen; skb_set_network_header(skb, skb_network_offset(skb) + WEP_IV_LEN); ieee80211_wep_get_iv(local, keylen, keyidx, newhdr + hdrlen); return newhdr + hdrlen; } static void ieee80211_wep_remove_iv(struct ieee80211_local *local, struct sk_buff *skb, struct ieee80211_key *key) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; unsigned int hdrlen; hdrlen = ieee80211_hdrlen(hdr->frame_control); memmove(skb->data + WEP_IV_LEN, skb->data, hdrlen); skb_pull(skb, WEP_IV_LEN); } /* Perform WEP encryption using given key. data buffer must have tailroom * for 4-byte ICV. data_len must not include this ICV. Note: this function * does _not_ add IV. data = RC4(data | CRC32(data)) */ int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key, size_t klen, u8 *data, size_t data_len) { __le32 icv; int i; if (IS_ERR(tfm)) return -1; icv = cpu_to_le32(~crc32_le(~0, data, data_len)); put_unaligned(icv, (__le32 *)(data + data_len)); crypto_cipher_setkey(tfm, rc4key, klen); for (i = 0; i < data_len + WEP_ICV_LEN; i++) crypto_cipher_encrypt_one(tfm, data + i, data + i); return 0; } /* Perform WEP encryption on given skb. 4 bytes of extra space (IV) in the * beginning of the buffer 4 bytes of extra space (ICV) in the end of the * buffer will be added. Both IV and ICV will be transmitted, so the * payload length increases with 8 bytes. * * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) */ int ieee80211_wep_encrypt(struct ieee80211_local *local, struct sk_buff *skb, const u8 *key, int keylen, int keyidx) { u8 *iv; size_t len; u8 rc4key[3 + WLAN_KEY_LEN_WEP104]; iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx); if (!iv) return -1; len = skb->len - (iv + WEP_IV_LEN - skb->data); /* Prepend 24-bit IV to RC4 key */ memcpy(rc4key, iv, 3); /* Copy rest of the WEP key (the secret part) */ memcpy(rc4key + 3, key, keylen); /* Add room for ICV */ skb_put(skb, WEP_ICV_LEN); return ieee80211_wep_encrypt_data(local->wep_tx_tfm, rc4key, keylen + 3, iv + WEP_IV_LEN, len); } /* Perform WEP decryption using given key. data buffer includes encrypted * payload, including 4-byte ICV, but _not_ IV. data_len must not include ICV. * Return 0 on success and -1 on ICV mismatch. */ int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key, size_t klen, u8 *data, size_t data_len) { __le32 crc; int i; if (IS_ERR(tfm)) return -1; crypto_cipher_setkey(tfm, rc4key, klen); for (i = 0; i < data_len + WEP_ICV_LEN; i++) crypto_cipher_decrypt_one(tfm, data + i, data + i); crc = cpu_to_le32(~crc32_le(~0, data, data_len)); if (memcmp(&crc, data + data_len, WEP_ICV_LEN) != 0) /* ICV mismatch */ return -1; return 0; } /* Perform WEP decryption on given skb. Buffer includes whole WEP part of * the frame: IV (4 bytes), encrypted payload (including SNAP header), * ICV (4 bytes). skb->len includes both IV and ICV. * * Returns 0 if frame was decrypted successfully and ICV was correct and -1 on * failure. If frame is OK, IV and ICV will be removed, i.e., decrypted payload * is moved to the beginning of the skb and skb length will be reduced. */ static int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, struct ieee80211_key *key) { u32 klen; u8 rc4key[3 + WLAN_KEY_LEN_WEP104]; u8 keyidx; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; unsigned int hdrlen; size_t len; int ret = 0; if (!ieee80211_has_protected(hdr->frame_control)) return -1; hdrlen = ieee80211_hdrlen(hdr->frame_control); if (skb->len < hdrlen + WEP_IV_LEN + WEP_ICV_LEN) return -1; len = skb->len - hdrlen - WEP_IV_LEN - WEP_ICV_LEN; keyidx = skb->data[hdrlen + 3] >> 6; if (!key || keyidx != key->conf.keyidx) return -1; klen = 3 + key->conf.keylen; /* Prepend 24-bit IV to RC4 key */ memcpy(rc4key, skb->data + hdrlen, 3); /* Copy rest of the WEP key (the secret part) */ memcpy(rc4key + 3, key->conf.key, key->conf.keylen); if (ieee80211_wep_decrypt_data(local->wep_rx_tfm, rc4key, klen, skb->data + hdrlen + WEP_IV_LEN, len)) ret = -1; /* Trim ICV */ skb_trim(skb, skb->len - WEP_ICV_LEN); /* Remove IV */ memmove(skb->data + WEP_IV_LEN, skb->data, hdrlen); skb_pull(skb, WEP_IV_LEN); return ret; } static bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; unsigned int hdrlen; u8 *ivpos; u32 iv; hdrlen = ieee80211_hdrlen(hdr->frame_control); ivpos = skb->data + hdrlen; iv = (ivpos[0] << 16) | (ivpos[1] << 8) | ivpos[2]; return ieee80211_wep_weak_iv(iv, key->conf.keylen); } ieee80211_rx_result ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx) { struct sk_buff *skb = rx->skb; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; __le16 fc = hdr->frame_control; if (!ieee80211_is_data(fc) && !ieee80211_is_auth(fc)) return RX_CONTINUE; if (!(status->flag & RX_FLAG_DECRYPTED)) { if (skb_linearize(rx->skb)) return RX_DROP_UNUSABLE; if (rx->sta && ieee80211_wep_is_weak_iv(rx->skb, rx->key)) rx->sta->wep_weak_iv_count++; if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) return RX_DROP_UNUSABLE; } else if (!(status->flag & RX_FLAG_IV_STRIPPED)) { if (!pskb_may_pull(rx->skb, ieee80211_hdrlen(fc) + WEP_IV_LEN)) return RX_DROP_UNUSABLE; if (rx->sta && ieee80211_wep_is_weak_iv(rx->skb, rx->key)) rx->sta->wep_weak_iv_count++; ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key); /* remove ICV */ if (pskb_trim(rx->skb, rx->skb->len - WEP_ICV_LEN)) return RX_DROP_UNUSABLE; } return RX_CONTINUE; } static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_key_conf *hw_key = info->control.hw_key; if (!hw_key) { if (ieee80211_wep_encrypt(tx->local, skb, tx->key->conf.key, tx->key->conf.keylen, tx->key->conf.keyidx)) return -1; } else if ((hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) || (hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) { if (!ieee80211_wep_add_iv(tx->local, skb, tx->key->conf.keylen, tx->key->conf.keyidx)) return -1; } return 0; } ieee80211_tx_result ieee80211_crypto_wep_encrypt(struct ieee80211_tx_data *tx) { struct sk_buff *skb; ieee80211_tx_set_protected(tx); skb_queue_walk(&tx->skbs, skb) { if (wep_encrypt_skb(tx, skb) < 0) { I802_DEBUG_INC(tx->local->tx_handlers_drop_wep); return TX_DROP; } } return TX_CONTINUE; }