Commit d85f5793 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PPP_MPPE]: Don't put InterimKey on the stack
  SCTP : Add paramters validity check for ASCONF chunk
  SCTP: Discard OOTB packetes with bundled INIT early.
  SCTP: Clean up OOTB handling and fix infinite loop processing
  SCTP: Explicitely discard OOTB chunks
  SCTP: Send ABORT chunk with correct tag in response to INIT ACK
  SCTP: Validate buffer room when processing sequential chunks
  [PATCH] mac80211: fix initialisation when built-in
  [PATCH] net/mac80211/wme.c: fix sparse warning
  [PATCH] cfg80211: fix initialisation if built-in
  [PATCH] net/wireless/sysfs.c: Shut up build warning
parents acbbe6c2 45dfd5b5

drivers/net/ppp_mppe.c

+6 −8
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct ppp_mppe_state { 
 * Key Derivation, from RFC 3078, RFC 3079.

 * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079.

 */

static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *InterimKey)

static void get_new_key_from_sha(struct ppp_mppe_state * state)

{

	struct hash_desc desc;

	struct scatterlist sg[4];
@@ -153,8 +153,6 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I 
	desc.flags = 0;



	crypto_hash_digest(&desc, sg, nbytes, state->sha1_digest);



	memcpy(InterimKey, state->sha1_digest, state->keylen);

}



/*
@@ -163,21 +161,21 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I 
 */

static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)

{

	unsigned char InterimKey[MPPE_MAX_KEY_LEN];

	struct scatterlist sg_in[1], sg_out[1];

	struct blkcipher_desc desc = { .tfm = state->arc4 };



	get_new_key_from_sha(state, InterimKey);

	get_new_key_from_sha(state);

	if (!initial_key) {

		crypto_blkcipher_setkey(state->arc4, InterimKey, state->keylen);

		setup_sg(sg_in, InterimKey, state->keylen);

		crypto_blkcipher_setkey(state->arc4, state->sha1_digest,

					state->keylen);

		setup_sg(sg_in, state->sha1_digest, state->keylen);

		setup_sg(sg_out, state->session_key, state->keylen);

		if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,

					     state->keylen) != 0) {

    		    printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");

		}

	} else {

		memcpy(state->session_key, InterimKey, state->keylen);

		memcpy(state->session_key, state->sha1_digest, state->keylen);

	}

	if (state->keylen == 8) {

		/* See RFC 3078 */

include/net/sctp/sm.h

+3 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ sctp_state_fn_t sctp_sf_do_4_C; 
sctp_state_fn_t sctp_sf_eat_data_6_2;

sctp_state_fn_t sctp_sf_eat_data_fast_4_4;

sctp_state_fn_t sctp_sf_eat_sack_6_2;

sctp_state_fn_t sctp_sf_tabort_8_4_8;

sctp_state_fn_t sctp_sf_operr_notify;

sctp_state_fn_t sctp_sf_t1_init_timer_expire;

sctp_state_fn_t sctp_sf_t1_cookie_timer_expire;
@@ -247,6 +246,9 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *, 
					      int, __be16);

struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc,

					     union sctp_addr *addr);

int sctp_verify_asconf(const struct sctp_association *asoc,

		       struct sctp_paramhdr *param_hdr, void *chunk_end,

		       struct sctp_paramhdr **errp);

struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,

				       struct sctp_chunk *asconf);

int sctp_process_asconf_ack(struct sctp_association *asoc,

include/net/sctp/structs.h

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ struct sctp_signed_cookie { 
 * internally.

 */

union sctp_addr_param {

	struct sctp_paramhdr p;

	struct sctp_ipv4addr_param v4;

	struct sctp_ipv6addr_param v6;

};

net/mac80211/ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void) 
}





module_init(ieee80211_init);

subsys_initcall(ieee80211_init);

module_exit(ieee80211_exit);



MODULE_DESCRIPTION("IEEE 802.11 subsystem");

net/mac80211/rc80211_simple.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static void __exit rate_control_simple_exit(void) 
}





module_init(rate_control_simple_init);

subsys_initcall(rate_control_simple_init);

module_exit(rate_control_simple_exit);



MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");

CRA Git | Maintained and supported by SUSTech CRA and CCSE