Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 519d25679e8ae7433c758b9e74b19144f61b90f8

Authored by David Howells
Committed by Linus Torvalds
1 parent 0dd5198672
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

RxRPC: Don't attempt to reuse aborted connections 

Connections that have seen a connection-level abort should not be reused
as the far end will just abort them again; instead a new connection
should be made.

Connection-level aborts occur due to such things as authentication
failures.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 16 additions and 1 deletions Side-by-side Diff

net/rxrpc/ar-connection.c
Diff comments   View file @ 519d256
... ... @@ -444,6 +444,11 @@
444 444 conn = list_entry(bundle->avail_conns.next,
445 445 struct rxrpc_connection,
446 446 bundle_link);
  447 + if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
  448 + list_del_init(&conn->bundle_link);
  449 + bundle->num_conns--;
  450 + continue;
  451 + }
447 452 if (--conn->avail_calls == 0)
448 453 list_move(&conn->bundle_link,
449 454 &bundle->busy_conns);
... ... @@ -461,6 +466,11 @@
461 466 conn = list_entry(bundle->unused_conns.next,
462 467 struct rxrpc_connection,
463 468 bundle_link);
  469 + if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
  470 + list_del_init(&conn->bundle_link);
  471 + bundle->num_conns--;
  472 + continue;
  473 + }
464 474 ASSERTCMP(conn->avail_calls, ==, RXRPC_MAXCALLS);
465 475 conn->avail_calls = RXRPC_MAXCALLS - 1;
466 476 ASSERT(conn->channels[0] == NULL &&
net/rxrpc/ar-connevent.c
Diff comments   View file @ 519d256
... ... @@ -150,11 +150,15 @@
150 150 u32 serial;
151 151 int loop, ret;
152 152  
153   - if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED)
  153 + if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
  154 + kleave(" = -ECONNABORTED [%u]", conn->state);
154 155 return -ECONNABORTED;
  156 + }
155 157  
156 158 serial = ntohl(sp->hdr.serial);
157 159  
  160 + _enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, serial);
  161 +
158 162 switch (sp->hdr.type) {
159 163 case RXRPC_PACKET_TYPE_ABORT:
160 164 if (skb_copy_bits(skb, 0, &tmp, sizeof(tmp)) < 0)
... ... @@ -199,6 +203,7 @@
199 203 return 0;
200 204  
201 205 default:
  206 + _leave(" = -EPROTO [%u]", sp->hdr.type);
202 207 return -EPROTO;
203 208 }
204 209 }