diff options
| author |   David Howells <dhowells@redhat.com> | 2017-04-06 10:12:00 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-04-06 11:09:39 +0100 |
| commit | fb46f6ee10e78799ea38cf97e4bf52cb70f1228a (patch) | |
| tree | 070c369bd2417cc34c6e61b93e8567450406a55c /net/rxrpc/input.c | |
| parent | rxrpc: Handle temporary errors better in rxkad security (diff) | |
| download | linux-dev-fb46f6ee10e78799ea38cf97e4bf52cb70f1228a.tar.xz linux-dev-fb46f6ee10e78799ea38cf97e4bf52cb70f1228a.zip | |
rxrpc: Trace protocol errors in received packets
Add a tracepoint (rxrpc_rx_proto) to record protocol errors in received
packets. The following changes are made:
(1) Add a function, __rxrpc_abort_eproto(), to note a protocol error on a
call and mark the call aborted. This is wrapped by
rxrpc_abort_eproto() that makes the why string usable in trace.
(2) Add trace_rxrpc_rx_proto() or rxrpc_abort_eproto() to protocol error
generation points, replacing rxrpc_abort_call() with the latter.
(3) Only send an abort packet in rxkad_verify_packet*() if we actually
managed to abort the call.
Note that a trace event is also emitted if a kernel user (e.g. afs) tries
to send data through a call when it's not in the transmission phase, though
it's not technically a receive event.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | net/rxrpc/input.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 3a7754c87aef..3685dbe05a8f 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -1017,8 +1017,11 @@ int rxrpc_extract_header(struct rxrpc_skb_priv *sp, struct sk_buff *skb) struct rxrpc_wire_header whdr; /* dig out the RxRPC connection details */ - if (skb_copy_bits(skb, 0, &whdr, sizeof(whdr)) < 0) + if (skb_copy_bits(skb, 0, &whdr, sizeof(whdr)) < 0) { + trace_rxrpc_rx_eproto(NULL, sp->hdr.serial, + tracepoint_string("bad_hdr")); return -EBADMSG; + } memset(sp, 0, sizeof(*sp)); sp->hdr.epoch = ntohl(whdr.epoch); |