* [PATCH net 0/2] rxrpc: Fix a warning and a leak
@ 2020-05-22 23:23 David Howells
2020-05-22 23:23 ` [PATCH net 1/2] rxrpc: Fix a warning David Howells
2020-05-22 23:23 ` [PATCH net 2/2] A ticket was not released after a call of the function David Howells
0 siblings, 2 replies; 3+ messages in thread
From: David Howells @ 2020-05-22 23:23 UTC (permalink / raw)
To: netdev; +Cc: dhowells, linux-afs, linux-kernel
Here are a couple of fixes for AF_RXRPC:
(1) Fix an uninitialised variable warning.
(2) Fix a leak of the ticket on error in rxkad.
The patches are tagged here:
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git
rxrpc-fixes-20200523
and can also be found on the following branch:
http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=rxrpc-fixes
and follows on from rxrpc-fixes-20200521.
David
---
Qiushi Wu (1):
A ticket was not released after a call of the function
fs/afs/fs_probe.c | 18 ++--
fs/afs/vl_probe.c | 18 ++--
include/net/af_rxrpc.h | 2 +-
include/trace/events/rxrpc.h | 52 +++++++++---
net/rxrpc/Makefile | 1 +
net/rxrpc/ar-internal.h | 25 ++++--
net/rxrpc/call_accept.c | 2 +-
net/rxrpc/call_event.c | 22 ++---
net/rxrpc/input.c | 44 ++++++++--
net/rxrpc/misc.c | 5 --
net/rxrpc/output.c | 9 +-
net/rxrpc/peer_event.c | 46 ----------
net/rxrpc/peer_object.c | 12 +--
net/rxrpc/proc.c | 8 +-
net/rxrpc/rtt.c | 195 +++++++++++++++++++++++++++++++++++++++++++
net/rxrpc/rxkad.c | 3 +-
net/rxrpc/sendmsg.c | 26 ++----
net/rxrpc/sysctl.c | 9 --
18 files changed, 336 insertions(+), 161 deletions(-)
create mode 100644 net/rxrpc/rtt.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH net 1/2] rxrpc: Fix a warning
2020-05-22 23:23 [PATCH net 0/2] rxrpc: Fix a warning and a leak David Howells
@ 2020-05-22 23:23 ` David Howells
2020-05-22 23:23 ` [PATCH net 2/2] A ticket was not released after a call of the function David Howells
1 sibling, 0 replies; 3+ messages in thread
From: David Howells @ 2020-05-22 23:23 UTC (permalink / raw)
To: netdev; +Cc: dhowells, linux-afs, linux-kernel
Fix a warning due to an uninitialised variable.
le included from ../fs/afs/fs_probe.c:11:
../fs/afs/fs_probe.c: In function 'afs_fileserver_probe_result':
../fs/afs/internal.h:1453:2: warning: 'rtt_us' may be used uninitialized in this function [-Wmaybe-uninitialized]
1453 | printk("[%-6.6s] "FMT"\n", current->comm ,##__VA_ARGS__)
| ^~~~~~
../fs/afs/fs_probe.c:35:15: note: 'rtt_us' was declared here
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/afs/fs_probe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c
index 237352d3cb53..37d1bba57b00 100644
--- a/fs/afs/fs_probe.c
+++ b/fs/afs/fs_probe.c
@@ -32,7 +32,7 @@ void afs_fileserver_probe_result(struct afs_call *call)
struct afs_server *server = call->server;
unsigned int server_index = call->server_index;
unsigned int index = call->addr_ix;
- unsigned int rtt_us;
+ unsigned int rtt_us = 0;
bool have_result = false;
int ret = call->error;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH net 2/2] A ticket was not released after a call of the function
2020-05-22 23:23 [PATCH net 0/2] rxrpc: Fix a warning and a leak David Howells
2020-05-22 23:23 ` [PATCH net 1/2] rxrpc: Fix a warning David Howells
@ 2020-05-22 23:23 ` David Howells
1 sibling, 0 replies; 3+ messages in thread
From: David Howells @ 2020-05-22 23:23 UTC (permalink / raw)
To: netdev; +Cc: dhowells, linux-afs, linux-kernel
From: Qiushi Wu <wu000273@umn.edu>
"rxkad_decrypt_ticket" failed. Thus replace the jump target
"temporary_error_free_resp" by "temporary_error_free_ticket".
Fixes: 8c2f826dc3631 ("rxrpc: Don't put crypto buffers on the stack")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Markus Elfring <Markus.Elfring@web.de>
---
net/rxrpc/rxkad.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 098f1f9ec53b..52a24d4ef5d8 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -1148,7 +1148,7 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
ret = rxkad_decrypt_ticket(conn, skb, ticket, ticket_len, &session_key,
&expiry, _abort_code);
if (ret < 0)
- goto temporary_error_free_resp;
+ goto temporary_error_free_ticket;
/* use the session key from inside the ticket to decrypt the
* response */
@@ -1230,7 +1230,6 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
temporary_error_free_ticket:
kfree(ticket);
-temporary_error_free_resp:
kfree(response);
temporary_error:
/* Ignore the response packet if we got a temporary error such as
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-22 23:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 23:23 [PATCH net 0/2] rxrpc: Fix a warning and a leak David Howells
2020-05-22 23:23 ` [PATCH net 1/2] rxrpc: Fix a warning David Howells
2020-05-22 23:23 ` [PATCH net 2/2] A ticket was not released after a call of the function David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).