Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ccbe208 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.315 into android-4.19-stable 



Changes in 4.19.315
	Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems"
	dm: limit the number of targets and parameter size area
	btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
	tracing: Simplify creation and deletion of synthetic events
	tracing: Add unified dynamic event framework
	tracing: Use dyn_event framework for synthetic events
	tracing: Remove unneeded synth_event_mutex
	tracing: Consolidate trace_add/remove_event_call back to the nolock functions
	string.h: Add str_has_prefix() helper function
	tracing: Use str_has_prefix() helper for histogram code
	tracing: Use str_has_prefix() instead of using fixed sizes
	tracing: Have the historgram use the result of str_has_prefix() for len of prefix
	tracing: Refactor hist trigger action code
	tracing: Split up onmatch action data
	tracing: Generalize hist trigger onmax and save action
	tracing: Remove unnecessary var_ref destroy in track_data_destroy()
	serial: kgdboc: Fix NMI-safety problems from keyboard reset code
	docs: kernel_include.py: Cope with docutils 0.21
	Linux 4.19.315

Change-Id: I20fdf3ecd83c6f7654e6118390444de784a0b100
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 65e58a86 10cfa55f

Documentation/sphinx/kernel_include.py

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ class KernelInclude(Include): 
        # HINT: this is the only line I had to change / commented out:

        #path = utils.relative_path(None, path)



        path = nodes.reprunicode(path)

        encoding = self.options.get(

            'encoding', self.state.document.settings.input_encoding)

        e_handler=self.state.document.settings.input_encoding_error_handler

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 314

SUBLEVEL = 315

EXTRAVERSION =

NAME = "People's Front"

drivers/md/dm-core.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include "dm.h"



#define DM_RESERVED_MAX_IOS		1024

#define DM_MAX_TARGETS			1048576

#define DM_MAX_TARGET_PARAMS		1024



struct dm_kobject_holder {

	struct kobject kobj;

drivers/md/dm-ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,8 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl *param_kern 
	if (copy_from_user(param_kernel, user, minimum_data_size))

		return -EFAULT;



	if (param_kernel->data_size < minimum_data_size)

	if (unlikely(param_kernel->data_size < minimum_data_size) ||

	    unlikely(param_kernel->data_size > DM_MAX_TARGETS * DM_MAX_TARGET_PARAMS))

		return -EINVAL;



	secure_data = param_kernel->flags & DM_SECURE_DATA_FLAG;

drivers/md/dm-table.c

+7 −2
Original line number Diff line number Diff line
@@ -189,7 +189,12 @@ static int alloc_targets(struct dm_table *t, unsigned int num) 
int dm_table_create(struct dm_table **result, fmode_t mode,

		    unsigned num_targets, struct mapped_device *md)

{

	struct dm_table *t = kzalloc(sizeof(*t), GFP_KERNEL);

	struct dm_table *t;



	if (num_targets > DM_MAX_TARGETS)

		return -EOVERFLOW;



	t = kzalloc(sizeof(*t), GFP_KERNEL);



	if (!t)

		return -ENOMEM;
@@ -204,7 +209,7 @@ int dm_table_create(struct dm_table **result, fmode_t mode, 


	if (!num_targets) {

		kfree(t);

		return -ENOMEM;

		return -EOVERFLOW;

	}



	if (alloc_targets(t, num_targets)) {