Whamcloud - gitweb
LU-15014 osc: Fix possible null pointer 75/44975/3
authorPatrick Farrell <pfarrell@whamcloud.com>
Thu, 6 Oct 2022 11:40:41 +0000 (07:40 -0400)
committerOleg Drokin <green@whamcloud.com>
Tue, 20 Dec 2022 14:43:39 +0000 (14:43 +0000)
Change init to fix possible null pointer access.

Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: Id1bee8b5ea5fb92a8831992ad44c487c69d52e1e
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/44975
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/osc/osc_cache.c

index 8240ae6..663e749 100644 (file)
@@ -2233,15 +2233,13 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
                        struct cl_page *page, loff_t offset)
 {
        struct osc_async_page *oap = &ops->ops_oap;
-       struct page           *vmpage = page->cp_vmpage;
-       ENTRY;
 
+       ENTRY;
        if (!page)
                return cfs_size_round(sizeof(*oap));
 
        oap->oap_obj = osc;
-
-       oap->oap_page = vmpage;
+       oap->oap_page = page->cp_vmpage;
        oap->oap_obj_off = offset;
        LASSERT(!(offset & ~PAGE_MASK));
 
@@ -2257,7 +2255,7 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
        INIT_LIST_HEAD(&oap->oap_rpc_item);
 
        CDEBUG(D_INFO, "oap %p vmpage %p obj off %llu\n",
-              oap, vmpage, oap->oap_obj_off);
+              oap, oap->oap_page, oap->oap_obj_off);
        RETURN(0);
 }
 EXPORT_SYMBOL(osc_prep_async_page);