Skip to content

Commit 8ab6ffb

Browse files
mokomulldavem330
authored andcommitted
tls: don't use stack memory in a scatterlist
scatterlist code expects virt_to_page() to work, which fails with CONFIG_VMAP_STACK=y. Fixes: c46234e ("tls: RX path for ktls") Signed-off-by: Matt Mullins <mmullins@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 7063efd commit 8ab6ffb

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

include/net/tls.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ struct tls_sw_context {
9797
u8 control;
9898
bool decrypted;
9999

100+
char rx_aad_ciphertext[TLS_AAD_SPACE_SIZE];
101+
char rx_aad_plaintext[TLS_AAD_SPACE_SIZE];
102+
100103
/* Sending context */
101104
char aad_space[TLS_AAD_SPACE_SIZE];
102105

net/tls/tls_sw.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,6 @@ static int decrypt_skb(struct sock *sk, struct sk_buff *skb,
680680
struct scatterlist *sgin = &sgin_arr[0];
681681
struct strp_msg *rxm = strp_msg(skb);
682682
int ret, nsg = ARRAY_SIZE(sgin_arr);
683-
char aad_recv[TLS_AAD_SPACE_SIZE];
684683
struct sk_buff *unused;
685684

686685
ret = skb_copy_bits(skb, rxm->offset + TLS_HEADER_SIZE,
@@ -698,13 +697,13 @@ static int decrypt_skb(struct sock *sk, struct sk_buff *skb,
698697
}
699698

700699
sg_init_table(sgin, nsg);
701-
sg_set_buf(&sgin[0], aad_recv, sizeof(aad_recv));
700+
sg_set_buf(&sgin[0], ctx->rx_aad_ciphertext, TLS_AAD_SPACE_SIZE);
702701

703702
nsg = skb_to_sgvec(skb, &sgin[1],
704703
rxm->offset + tls_ctx->rx.prepend_size,
705704
rxm->full_len - tls_ctx->rx.prepend_size);
706705

707-
tls_make_aad(aad_recv,
706+
tls_make_aad(ctx->rx_aad_ciphertext,
708707
rxm->full_len - tls_ctx->rx.overhead_size,
709708
tls_ctx->rx.rec_seq,
710709
tls_ctx->rx.rec_seq_size,
@@ -803,12 +802,12 @@ int tls_sw_recvmsg(struct sock *sk,
803802
if (to_copy <= len && page_count < MAX_SKB_FRAGS &&
804803
likely(!(flags & MSG_PEEK))) {
805804
struct scatterlist sgin[MAX_SKB_FRAGS + 1];
806-
char unused[21];
807805
int pages = 0;
808806

809807
zc = true;
810808
sg_init_table(sgin, MAX_SKB_FRAGS + 1);
811-
sg_set_buf(&sgin[0], unused, 13);
809+
sg_set_buf(&sgin[0], ctx->rx_aad_plaintext,
810+
TLS_AAD_SPACE_SIZE);
812811

813812
err = zerocopy_from_iter(sk, &msg->msg_iter,
814813
to_copy, &pages,

0 commit comments

Comments
 (0)