diff options
| author | David Howells <dhowells@redhat.com> | 2017-04-06 10:11:56 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-04-06 10:11:56 +0100 |
| commit | 3a92789af0d625caff1e0bf5701aec8edf0d057d (patch) | |
| tree | 8ad074e2048b742c7c4e8aebfbb3aeadc552a525 /net/rxrpc/rxkad.c | |
| parent | faeeb317a5615076dff1ff44b51e862e6064dbd0 (diff) | |
| download | op-kernel-dev-3a92789af0d625caff1e0bf5701aec8edf0d057d.zip op-kernel-dev-3a92789af0d625caff1e0bf5701aec8edf0d057d.tar.gz | |
rxrpc: Use negative error codes in rxrpc_call struct
Use negative error codes in struct rxrpc_call::error because that's what
the kernel normally deals with and to make the code consistent. We only
turn them positive when transcribing into a cmsg for userspace recvmsg.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/rxkad.c')
| -rw-r--r-- | net/rxrpc/rxkad.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index 4374e7b..2d5838a 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -330,7 +330,7 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb, _enter(""); if (len < 8) { - rxrpc_abort_call("V1H", call, seq, RXKADSEALEDINCON, EPROTO); + rxrpc_abort_call("V1H", call, seq, RXKADSEALEDINCON, -EPROTO); goto protocol_error; } @@ -355,7 +355,7 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb, /* Extract the decrypted packet length */ if (skb_copy_bits(skb, offset, &sechdr, sizeof(sechdr)) < 0) { - rxrpc_abort_call("XV1", call, seq, RXKADDATALEN, EPROTO); + rxrpc_abort_call("XV1", call, seq, RXKADDATALEN, -EPROTO); goto protocol_error; } offset += sizeof(sechdr); @@ -368,12 +368,12 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb, check ^= seq ^ call->call_id; check &= 0xffff; if (check != 0) { - rxrpc_abort_call("V1C", call, seq, RXKADSEALEDINCON, EPROTO); + rxrpc_abort_call("V1C", call, seq, RXKADSEALEDINCON, -EPROTO); goto protocol_error; } if (data_size > len) { - rxrpc_abort_call("V1L", call, seq, RXKADDATALEN, EPROTO); + rxrpc_abort_call("V1L", call, seq, RXKADDATALEN, -EPROTO); goto protocol_error; } @@ -410,7 +410,7 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb, _enter(",{%d}", skb->len); if (len < 8) { - rxrpc_abort_call("V2H", call, seq, RXKADSEALEDINCON, EPROTO); + rxrpc_abort_call("V2H", call, seq, RXKADSEALEDINCON, -EPROTO); goto protocol_error; } @@ -445,7 +445,7 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb, /* Extract the decrypted packet length */ if (skb_copy_bits(skb, offset, &sechdr, sizeof(sechdr)) < 0) { - rxrpc_abort_call("XV2", call, seq, RXKADDATALEN, EPROTO); + rxrpc_abort_call("XV2", call, seq, RXKADDATALEN, -EPROTO); goto protocol_error; } offset += sizeof(sechdr); @@ -458,12 +458,12 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb, check ^= seq ^ call->call_id; check &= 0xffff; if (check != 0) { - rxrpc_abort_call("V2C", call, seq, RXKADSEALEDINCON, EPROTO); + rxrpc_abort_call("V2C", call, seq, RXKADSEALEDINCON, -EPROTO); goto protocol_error; } if (data_size > len) { - rxrpc_abort_call("V2L", call, seq, RXKADDATALEN, EPROTO); + rxrpc_abort_call("V2L", call, seq, RXKADDATALEN, -EPROTO); goto protocol_error; } @@ -522,7 +522,7 @@ static int rxkad_verify_packet(struct rxrpc_call *call, struct sk_buff *skb, cksum = 1; /* zero checksums are not permitted */ if (cksum != expected_cksum) { - rxrpc_abort_call("VCK", call, seq, RXKADSEALEDINCON, EPROTO); + rxrpc_abort_call("VCK", call, seq, RXKADSEALEDINCON, -EPROTO); rxrpc_send_abort_packet(call); _leave(" = -EPROTO [csum failed]"); return -EPROTO; |
