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

Commit e90565f9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qmp: sphinx: Add Qualcomm Malware Protection kernel instrumentation"

parents f5bba2b6 3c77a990

fs/proc/base.c

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
#include <linux/slab.h>

#include <linux/flex_array.h>

#include <linux/posix-timers.h>

#include <linux/qmp_sphinx_instrumentation.h>

#ifdef CONFIG_HARDWALL

#include <asm/hardwall.h>

#endif
@@ -966,6 +967,9 @@ static ssize_t oom_adj_write(struct file *file, const char __user *buf, 
		goto out;

	}



	qmp_sphinx_logk_oom_adjust_write(task->pid,

			task->cred->uid, oom_adj);



	task_lock(task);

	if (!task->mm) {

		err = -EINVAL;
@@ -1098,6 +1102,9 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf, 
		goto out;

	}



	qmp_sphinx_logk_oom_adjust_write(task->pid,

			task->cred->uid, oom_score_adj);



	task_lock(task);

	if (!task->mm) {

		err = -EINVAL;

net/socket.c

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#include <linux/magic.h>

#include <linux/slab.h>

#include <linux/xattr.h>

#include <linux/qmp_sphinx_instrumentation.h>



#include <asm/uaccess.h>

#include <asm/unistd.h>
@@ -1782,6 +1783,8 @@ SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len, 
	struct iovec iov;

	int fput_needed;



	qmp_sphinx_logk_sendto(fd, buff, len, flags, addr, addr_len);



	if (len > INT_MAX)

		len = INT_MAX;

	sock = sockfd_lookup_light(fd, &err, &fput_needed);
@@ -1841,6 +1844,8 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, 
	int err, err2;

	int fput_needed;



	qmp_sphinx_logk_recvfrom(fd, ubuf, size, flags, addr, addr_len);



	if (size > INT_MAX)

		size = INT_MAX;

	sock = sockfd_lookup_light(fd, &err, &fput_needed);