diff options
| author | Adrian Salido <salidoa@google.com> | 2016-12-07 11:36:41 -0800 |
|---|---|---|
| committer | Adrian Salido <salidoa@google.com> | 2016-12-07 11:38:55 -0800 |
| commit | 1e3db871988035c7b4007bb03ad01cec1a8f6b3a (patch) | |
| tree | 746815f42503aebffdea2272eb212a2ba1ab3340 | |
| parent | 94b71ff5818e5fed4872338932fc9cdf2d9be8f2 (diff) | |
| parent | 10e2dd9d254ebe71c0a08baa24bd7fe5b5e72f13 (diff) | |
| download | tegra-android-tegra-dragon-3.18-n-mr2-preview-1.tar.gz | |
Merge branch 'android-chromeos-dragon-3.18-nyc-mr1' into android-chromeos-dragon-3.18android-n-mr2-preview-1_r0.1android-tegra-dragon-3.18-n-mr2-preview-1
Security February 2017.1
Change-Id: I91a231d87e83e4b4fd43cd6edee37bffdd30091f
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_pno.c | 5 | ||||
| -rw-r--r-- | fs/aio.c | 1 | ||||
| -rw-r--r-- | fs/proc/array.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_pno.c b/drivers/net/wireless/bcmdhd/dhd_pno.c index 53c87cb3f726..52e0faa48c1a 100644 --- a/drivers/net/wireless/bcmdhd/dhd_pno.c +++ b/drivers/net/wireless/bcmdhd/dhd_pno.c @@ -3066,9 +3066,10 @@ _dhd_pno_get_for_batch(dhd_pub_t *dhd, char *buf, int bufsize, int reason) list_del(&pscan_results->list); MFREE(dhd->osh, pscan_results, SCAN_RESULTS_SIZE); _params->params_batch.get_batch.top_node_cnt--; + } else { + /* increase total scan count using current scan count */ + _params->params_batch.get_batch.tot_scan_cnt += pscan_results->cnt_header; } - /* increase total scan count using current scan count */ - _params->params_batch.get_batch.tot_scan_cnt += pscan_results->cnt_header; if (buf && bufsize) { /* This is a first try to get batching results */ @@ -229,6 +229,7 @@ static int __init aio_setup(void) aio_mnt = kern_mount(&aio_fs); if (IS_ERR(aio_mnt)) panic("Failed to create aio fs mount."); + aio_mnt->mnt_flags |= MNT_NOEXEC; if (bdi_init(&aio_fs_backing_dev_info)) panic("Failed to init aio fs backing dev info."); diff --git a/fs/proc/array.c b/fs/proc/array.c index eb1508e84a54..d11e59e390cf 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -181,7 +181,7 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, "Uid:\t%d\t%d\t%d\t%d\n" "Gid:\t%d\t%d\t%d\t%d\n", get_task_state(p), - task_tgid_nr_ns(p, ns), + leader ? task_pid_nr_ns(leader, ns) : 0, task_numa_group_id(p), pid_nr_ns(pid, ns), ppid, tpid, |