diff options
| author | Siqi Lin <siqilin@google.com> | 2018-10-09 13:31:35 -0700 |
|---|---|---|
| committer | Siqi Lin <siqilin@google.com> | 2018-10-09 13:31:56 -0700 |
| commit | 89fd15db99aa19e57676241202f1edabd36fc020 (patch) | |
| tree | 79b57de16f2b45bdfbeca90ae26e425fac57cdd4 | |
| parent | 0a05126d69c9722521ab29847f75be52a56ada25 (diff) | |
| parent | 467141c4d5488a1c9fd24d3684a2df9d287eb251 (diff) | |
Merge branch 'android-msm-bullhead-3.10-security-next' into android-msm-bullhead-3.10android-8.1.0_r0.122
December 2018.1
Bug: 117289320
Change-Id: I410ab26da833e4bcf3b7900b270774a3b9953f20
Signed-off-by: Siqi Lin <siqilin@google.com>
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c | 3 | ||||
| -rw-r--r-- | drivers/platform/msm/sps/sps.c | 5 | ||||
| -rw-r--r-- | net/core/sock.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c index b3e7c953ec57..4c9f0c8fe0cd 100644 --- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c +++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c @@ -32,6 +32,8 @@ #define MSM_JPEG_NAME "jpeg" #define DEV_NAME_LEN 10 +static char devname[DEV_NAME_LEN]; + static int msm_jpeg_open(struct inode *inode, struct file *filp) { int rc = 0; @@ -185,7 +187,6 @@ static int msm_jpeg_init_dev(struct platform_device *pdev) struct msm_jpeg_device *msm_jpeg_device_p; const struct of_device_id *device_id; const struct msm_jpeg_priv_data *priv_data; - char devname[DEV_NAME_LEN]; msm_jpeg_device_p = kzalloc(sizeof(struct msm_jpeg_device), GFP_ATOMIC); if (!msm_jpeg_device_p) { diff --git a/drivers/platform/msm/sps/sps.c b/drivers/platform/msm/sps/sps.c index 935f6e8a26c4..9a60d9427035 100644 --- a/drivers/platform/msm/sps/sps.c +++ b/drivers/platform/msm/sps/sps.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1017,8 +1017,6 @@ static void sps_device_de_init(void) SPS_ERR("sps:SPS de-init: BAMs are still registered"); sps_map_de_init(); - - kfree(sps); } sps_mem_de_init(); @@ -2823,6 +2821,7 @@ static struct platform_driver msm_sps_driver = { .name = SPS_DRV_NAME, .owner = THIS_MODULE, .of_match_table = msm_sps_match, + .suppress_bind_attrs = true, }, .remove = msm_sps_remove, }; diff --git a/net/core/sock.c b/net/core/sock.c index 4e3d16d8412c..c8c6e65051df 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1467,6 +1467,8 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) sock_copy(newsk, sk); + newsk->sk_prot_creator = sk->sk_prot; + /* SANITY */ get_net(sock_net(newsk)); sk_node_init(&newsk->sk_node); |