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

Commit 0e0276d1 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Remove the aux_context structure 



This patch removes the aux_context structure (and the containing file)
to allow the placement of the _aarch64_ctx end magic based on the
context stored on the signal stack.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 9141300a

arch/arm64/include/asm/sigcontext.h

deleted100644 → 0
+0 −31
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2012 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_SIGCONTEXT_H

#define __ASM_SIGCONTEXT_H



#include <uapi/asm/sigcontext.h>



/*

 * Auxiliary context saved in the sigcontext.__reserved array. Not exported to

 * user space as it will change with the addition of new context. User space

 * should check the magic/size information.

 */

struct aux_context {

	struct fpsimd_context fpsimd;

	/* additional context to be added before "end" */

	struct _aarch64_ctx end;

};

#endif

arch/arm64/kernel/signal.c

+17 −10
Original line number Original line Diff line number Diff line
@@ -100,8 +100,7 @@ static int restore_sigframe(struct pt_regs *regs, 
{

{

	sigset_t set;

	sigset_t set;

	int i, err;

	int i, err;

	struct aux_context __user *aux =

	void *aux = sf->uc.uc_mcontext.__reserved;

		(struct aux_context __user *)sf->uc.uc_mcontext.__reserved;





	err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));

	err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));

	if (err == 0)

	if (err == 0)
@@ -121,8 +120,11 @@ static int restore_sigframe(struct pt_regs *regs, 




	err |= !valid_user_regs(&regs->user_regs);

	err |= !valid_user_regs(&regs->user_regs);





	if (err == 0)

	if (err == 0) {

		err |= restore_fpsimd_context(&aux->fpsimd);

		struct fpsimd_context *fpsimd_ctx =

			container_of(aux, struct fpsimd_context, head);

		err |= restore_fpsimd_context(fpsimd_ctx);

	}





	return err;

	return err;

}

}
@@ -167,8 +169,8 @@ static int setup_sigframe(struct rt_sigframe __user *sf, 
			  struct pt_regs *regs, sigset_t *set)

			  struct pt_regs *regs, sigset_t *set)

{

{

	int i, err = 0;

	int i, err = 0;

	struct aux_context __user *aux =

	void *aux = sf->uc.uc_mcontext.__reserved;

		(struct aux_context __user *)sf->uc.uc_mcontext.__reserved;

	struct _aarch64_ctx *end;





	/* set up the stack frame for unwinding */

	/* set up the stack frame for unwinding */

	__put_user_error(regs->regs[29], &sf->fp, err);

	__put_user_error(regs->regs[29], &sf->fp, err);
@@ -185,12 +187,17 @@ static int setup_sigframe(struct rt_sigframe __user *sf, 




	err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set));

	err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set));





	if (err == 0)

	if (err == 0) {

		err |= preserve_fpsimd_context(&aux->fpsimd);

		struct fpsimd_context *fpsimd_ctx =

			container_of(aux, struct fpsimd_context, head);

		err |= preserve_fpsimd_context(fpsimd_ctx);

		aux += sizeof(*fpsimd_ctx);

	}





	/* set the "end" magic */

	/* set the "end" magic */

	__put_user_error(0, &aux->end.magic, err);

	end = aux;

	__put_user_error(0, &aux->end.size, err);

	__put_user_error(0, &end->magic, err);

	__put_user_error(0, &end->size, err);





	return err;

	return err;

}

}