Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7da57a1 authored by David S. Miller's avatar David S. Miller
Browse files

[TCP]: Fix scatterlist handling in MD5 signature support. 



Use sg_init_table() and sg_mark_end() as needed.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e0940d4

net/ipv4/tcp_ipv4.c

+5 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,9 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
	bp->pad = 0;

	bp->protocol = protocol;

	bp->len = htons(tcplen);



	sg_init_table(sg, 4);



	sg_set_buf(&sg[block++], bp, sizeof(*bp));

	nbytes += sizeof(*bp);
@@ -1080,6 +1083,8 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
	sg_set_buf(&sg[block++], key->key, key->keylen);

	nbytes += key->keylen;



	sg_mark_end(sg, block);



	/* Now store the Hash into the packet */

	err = crypto_hash_init(desc);

	if (err)

net/ipv6/tcp_ipv6.c

+4 −0
Original line number Diff line number Diff line
@@ -757,6 +757,8 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
	bp->len = htonl(tcplen);

	bp->protocol = htonl(protocol);



	sg_init_table(sg, 4);



	sg_set_buf(&sg[block++], bp, sizeof(*bp));

	nbytes += sizeof(*bp);
@@ -778,6 +780,8 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key, 
	sg_set_buf(&sg[block++], key->key, key->keylen);

	nbytes += key->keylen;



	sg_mark_end(sg, block);



	/* Now store the hash into the packet */

	err = crypto_hash_init(desc);

	if (err) {