diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-12 14:18:42 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-05-19 11:25:02 -0700 |
| commit | e8f54ce169125a2e59330fac25ad3c9ac0ce22a5 (patch) | |
| tree | 10184a12eb50d98245f6e218efb631ada132ca8e /net | |
| parent | 1b36698577c1008dc1e63f0bf4b6f3d9deada94a (diff) | |
| download | linux-3.10-e8f54ce169125a2e59330fac25ad3c9ac0ce22a5.tar.gz linux-3.10-e8f54ce169125a2e59330fac25ad3c9ac0ce22a5.tar.bz2 linux-3.10-e8f54ce169125a2e59330fac25ad3c9ac0ce22a5.zip | |
libceph: fix uninitialized value when no get_authorizer method is set
If there is no get_authorizer method we set the out_kvec to a bogus
pointer. The length is also zero in that case, so it doesn't much matter,
but it's better not to add the empty item in the first place.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index b140dd3515d..ce326c80623 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -619,11 +619,12 @@ static int prepare_connect_authorizer(struct ceph_connection *con) con->out_connect.authorizer_protocol = cpu_to_le32(auth_protocol); con->out_connect.authorizer_len = cpu_to_le32(auth_len); - con->out_kvec[con->out_kvec_left].iov_base = auth_buf; - con->out_kvec[con->out_kvec_left].iov_len = auth_len; - con->out_kvec_left++; - con->out_kvec_bytes += auth_len; - + if (auth_len) { + con->out_kvec[con->out_kvec_left].iov_base = auth_buf; + con->out_kvec[con->out_kvec_left].iov_len = auth_len; + con->out_kvec_left++; + con->out_kvec_bytes += auth_len; + } return 0; } |