OSDN Git Service

Merge "msm: camera: fix Information leak"
authorLinux Build Service Account <lnxbuild@localhost>
Thu, 19 Jan 2017 07:48:35 +0000 (23:48 -0800)
committerGerrit - the friendly Code Review server <code-review@localhost>
Thu, 19 Jan 2017 07:48:35 +0000 (23:48 -0800)
1  2 
drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c

@@@ -299,10 -299,10 +299,10 @@@ static void msm_buf_mngr_sd_shutdown(st
        if (!list_empty(&dev->buf_qhead)) {
                list_for_each_entry_safe(bufs,
                        save, &dev->buf_qhead, entry) {
-                       pr_info("%s: Delete invalid bufs =%lx, session_id=%u, bufs->ses_id=%d, str_id=%d, idx=%d\n",
-                               __func__, (unsigned long)bufs, session->session,
+                       pr_info("%s: Delete invalid bufs =%pK, session_id=%u, bufs->ses_id=%d, str_id=%d, idx=%d\n",
+                               __func__, (void *)bufs, session->session,
                                bufs->session_id, bufs->stream_id,
 -                              bufs->vb2_v4l2_buf->vb2_buf.index);
 +                              bufs->index);
                        if (session->session == bufs->session_id) {
                                list_del_init(&bufs->entry);
                                kfree(bufs);