From: Andrew Deason Date: Mon, 18 Feb 2013 01:34:06 +0000 (-0600) Subject: rx: Assert call error for RXS_PreparePacket error X-Git-Tag: upstream/1.6.3^2~63 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d16fac9dfb55cc70bc9f868ee58db9ba143108e9;p=packages%2Fo%2Fopenafs.git rx: Assert call error for RXS_PreparePacket error If we've received an error from the underlying security class, we must not try to send the given packet, or we risk security issues. We currently achieve this by setting an error on the connection. It is slightly indirect in how this yields an error on this specific call, and so it may not be immediately clear, but doing so is critical. If somehow the call does not have an error by the end of this, we cannot proceed as this is an error condition we do not handle. So, assert. Reviewed-on: http://gerrit.openafs.org/9122 Tested-by: BuildBot Reviewed-by: Simon Wilkinson Reviewed-by: Derrick Brashear (cherry picked from commit 85f2a66ceafd7a13f51d0352c62b5d69f4620edb) Change-Id: Iae523e6f18dd73749a6be5c3d10e132e5c14a70c Reviewed-on: http://gerrit.openafs.org/9280 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Simon Wilkinson Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 218cdd4bb..7ac3a5710 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -2807,6 +2807,11 @@ rxi_PrepareSendPacket(struct rx_call *call, p = rxi_SendConnectionAbort(conn, p, 0, 0); MUTEX_EXIT(&conn->conn_data_lock); MUTEX_ENTER(&call->lock); + /* setting a connection error means all calls for that conn are also + * error'd. if this call does not have an error by now, something is + * very wrong, and we risk sending data in the clear that is supposed + * to be encrypted. */ + osi_Assert(call->error); } }