xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: ensure auth ops are defined before use

Browse Source 
In the create_authorizer method for both the mds and osd clients,
the auth_client->ops pointer is blindly dereferenced.  There is no
obvious guarantee that this pointer has been assigned.  And
furthermore, even if the ops pointer is non-null there is definitely
no guarantee that the create_authorizer or destroy_authorizer
methods are defined.

Add checks in both routines to make sure they are defined (non-null)
before use.  Add similar checks in a few other spots in these files
while we're at it.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Alex Elder
2012-05-16 15:16:39 -05:00
committed by Alex Elder
parent 74f1869f76
commit a255651d4c
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/ceph/mds_client.c
View File

@@ -3406,16 +3406,14 @@ static int get_authorizer(struct ceph_connection *con,
int ret = 0;
if (force_new && auth->authorizer) {
ac->ops->destroy_authorizer(ac, auth->authorizer);
if (ac->ops && ac->ops->destroy_authorizer)
ac->ops->destroy_authorizer(ac, auth->authorizer);
auth->authorizer = NULL;
}
if (auth->authorizer == NULL) {
if (ac->ops->create_authorizer) {
ret = ac->ops->create_authorizer(ac,
CEPH_ENTITY_TYPE_MDS, auth);
if (ret)
return ret;
}
if (!auth->authorizer && ac->ops && ac->ops->create_authorizer) {
ret = ac->ops->create_authorizer(ac, CEPH_ENTITY_TYPE_MDS, auth);
if (ret)
return ret;
}
*proto = ac->protocol;