aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-05-25 09:24:42 -0700
committerSage Weil <sage@newdream.net>2010-05-29 09:12:36 -0700
commite95e9a7ae4c1e7655a0438579f891b3c60178d77 (patch)
tree7704aabe47fe7ad8347717b4b6e2b58224b78d9b
parentaa91647c898d62e869fcf35e977ab3c533be8fc1 (diff)
downloadkernel_samsung_tuna-e95e9a7ae4c1e7655a0438579f891b3c60178d77.zip
kernel_samsung_tuna-e95e9a7ae4c1e7655a0438579f891b3c60178d77.tar.gz
kernel_samsung_tuna-e95e9a7ae4c1e7655a0438579f891b3c60178d77.tar.bz2
ceph: avoid possible null dereference
ac->ops may be null; use protocol id in error message instead. Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/auth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c
index 9f46de2..01c4a1c 100644
--- a/fs/ceph/auth.c
+++ b/fs/ceph/auth.c
@@ -217,8 +217,8 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,
if (ac->protocol != protocol) {
ret = ceph_auth_init_protocol(ac, protocol);
if (ret) {
- pr_err("error %d on auth method %s init\n",
- ret, ac->ops->name);
+ pr_err("error %d on auth protocol %d init\n",
+ ret, protocol);
goto out;
}
}