mirror of https://github.com/hak5/openwrt-owl.git
Florian Fainelli
parent
984ac762e4
commit
9fc22cd032
|
|
@ -3,6 +3,7 @@
|
|||
# CONFIG_8139TOO is not set
|
||||
# CONFIG_9P_FS is not set
|
||||
# CONFIG_AB3100_CORE is not set
|
||||
# CONFIG_AB4500_CORE is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_ACENIC is not set
|
||||
# CONFIG_ACORN_PARTITION is not set
|
||||
|
|
@ -387,6 +388,7 @@ CONFIG_CRYPTO_ALGAPI=y
|
|||
# CONFIG_CRYPTO_GCM is not set
|
||||
# CONFIG_CRYPTO_GF128MUL is not set
|
||||
# CONFIG_CRYPTO_GHASH is not set
|
||||
# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
|
||||
# CONFIG_CRYPTO_HASH is not set
|
||||
# CONFIG_CRYPTO_HMAC is not set
|
||||
# CONFIG_CRYPTO_HW is not set
|
||||
|
|
@ -901,6 +903,7 @@ CONFIG_INPUT_MISC=y
|
|||
# CONFIG_INPUT_PCSPKR is not set
|
||||
# CONFIG_INPUT_POLLDEV is not set
|
||||
# CONFIG_INPUT_POWERMATE is not set
|
||||
# CONFIG_INPUT_SPARSEKMAP is not set
|
||||
# CONFIG_INPUT_TABLET is not set
|
||||
# CONFIG_INPUT_TOUCHSCREEN is not set
|
||||
# CONFIG_INPUT_TSDEV is not set
|
||||
|
|
@ -1727,6 +1730,7 @@ CONFIG_PREEMPT_NONE=y
|
|||
# CONFIG_PREEMPT_RCU is not set
|
||||
# CONFIG_PREEMPT_RCU_TRACE is not set
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
# CONFIG_TI_DAC7512 is not set
|
||||
CONFIG_TINY_RCU=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
# CONFIG_PRINTK_TIME is not set
|
||||
|
|
@ -1887,6 +1891,7 @@ CONFIG_SCHED_CFS=y
|
|||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_SCHED_TRACER is not set
|
||||
# CONFIG_SCSI_3W_9XXX is not set
|
||||
# CONFIG_SCSI_3W_SAS is not set
|
||||
# CONFIG_SCSI_7000FASST is not set
|
||||
# CONFIG_SCSI_AACRAID is not set
|
||||
# CONFIG_SCSI_ACARD is not set
|
||||
|
|
@ -1918,6 +1923,7 @@ CONFIG_SCSI_DMA=y
|
|||
# CONFIG_SCSI_GENERIC_NCR5380 is not set
|
||||
# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
|
||||
# CONFIG_SCSI_HPTIOP is not set
|
||||
# CONFIG_SCSI_HPSA is not set
|
||||
# CONFIG_SCSI_IN2000 is not set
|
||||
# CONFIG_SCSI_INIA100 is not set
|
||||
# CONFIG_SCSI_INITIO is not set
|
||||
|
|
@ -1937,6 +1943,7 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
# CONFIG_SCSI_NSP32 is not set
|
||||
# CONFIG_SCSI_OSD_INITIATOR is not set
|
||||
# CONFIG_SCSI_PAS16 is not set
|
||||
# CONFIG_SCSI_PM8001 is not set
|
||||
# CONFIG_SCSI_PMCRAID is not set
|
||||
CONFIG_SCSI_PROC_FS=y
|
||||
# CONFIG_SCSI_PSI240I is not set
|
||||
|
|
@ -2234,11 +2241,13 @@ CONFIG_SND_VERBOSE_PROCFS=y
|
|||
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
|
||||
# CONFIG_SPI_AT25 is not set
|
||||
# CONFIG_SPI_DEBUG is not set
|
||||
# CONFIG_SPI_DESIGNWARE is not set
|
||||
# CONFIG_SPI_GPIO_OLD is not set
|
||||
# CONFIG_SPI is not set
|
||||
# CONFIG_SPI_MASTER is not set
|
||||
# CONFIG_SPI_ORION is not set
|
||||
# CONFIG_SPI_TLE62X0 is not set
|
||||
# CONFIG_SPI_XILINX is not set
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||
# CONFIG_SQUASHFS_EMBEDDED is not set
|
||||
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
|
||||
|
|
|
|||
|
|
@ -47,19 +47,43 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
|||
EXTRA_CFLAGS += -Werror
|
||||
--- a/arch/mips/math-emu/cp1emu.c
|
||||
+++ b/arch/mips/math-emu/cp1emu.c
|
||||
@@ -57,6 +57,8 @@
|
||||
#endif
|
||||
@@ -58,7 +58,11 @@
|
||||
#define __mips 4
|
||||
|
||||
+#ifdef CONFIG_MIPS_FPU_EMU
|
||||
+
|
||||
/* Function which emulates a floating point instruction. */
|
||||
+#ifdef CONFIG_DEBUG_FS
|
||||
+DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
|
||||
+#endif
|
||||
|
||||
+#ifdef CONFIG_MIPS_FPU_EMU
|
||||
static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
|
||||
@@ -1277,6 +1279,13 @@ int fpu_emulator_cop1Handler(struct pt_r
|
||||
mips_instruction);
|
||||
|
||||
@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
|
||||
|
||||
/* Further private data for which no space exists in mips_fpu_struct */
|
||||
|
||||
-#ifdef CONFIG_DEBUG_FS
|
||||
-DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
|
||||
-#endif
|
||||
-
|
||||
/* Control registers */
|
||||
|
||||
#define FPCREG_RID 0 /* $0 = revision id */
|
||||
@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r
|
||||
|
||||
return sig;
|
||||
}
|
||||
-
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
||||
static int fpuemu_stat_get(void *data, u64 *val)
|
||||
@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void)
|
||||
return 0;
|
||||
}
|
||||
__initcall(debugfs_fpuemu);
|
||||
-#endif
|
||||
+#endif /* CONFIG_DEBUGFS */
|
||||
+#else
|
||||
+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
|
||||
+ int has_fpu)
|
||||
|
|
@ -67,9 +91,6 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
|||
+ return 0;
|
||||
+}
|
||||
+#endif /* CONFIG_MIPS_FPU_EMU */
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
||||
--- a/arch/mips/math-emu/dsemul.c
|
||||
+++ b/arch/mips/math-emu/dsemul.c
|
||||
@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
|
||||
|
|
|
|||
|
|
@ -1847,7 +1847,7 @@
|
|||
+ };
|
||||
--- /dev/null
|
||||
+++ b/fs/mini_fo/fist.h
|
||||
@@ -0,0 +1,252 @@
|
||||
@@ -0,0 +1,254 @@
|
||||
+/*
|
||||
+ * Copyright (c) 1997-2003 Erez Zadok
|
||||
+ * Copyright (c) 2001-2003 Stony Brook University
|
||||
|
|
@ -1880,7 +1880,9 @@
|
|||
+ */
|
||||
+#ifdef __KERNEL__
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
|
||||
+#include <generated/autoconf.h>
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
|
||||
+#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <linux/config.h>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,15 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
unsigned int tp_packets;
|
||||
--- a/net/packet/af_packet.c
|
||||
+++ b/net/packet/af_packet.c
|
||||
@@ -343,6 +343,7 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
@@ -205,6 +205,7 @@ struct packet_sock {
|
||||
unsigned int tp_loss:1;
|
||||
#endif
|
||||
struct packet_type prot_hook ____cacheline_aligned_in_smp;
|
||||
+ __u8 pkt_type:3;
|
||||
};
|
||||
|
||||
struct packet_skb_cb {
|
||||
@@ -343,6 +344,7 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
{
|
||||
struct sock *sk;
|
||||
struct sockaddr_pkt *spkt;
|
||||
|
|
@ -34,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
|
||||
/*
|
||||
* When we registered the protocol we saved the socket in the data
|
||||
@@ -350,6 +351,7 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
@@ -350,6 +352,7 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
*/
|
||||
|
||||
sk = pt->af_packet_priv;
|
||||
|
|
@ -42,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
|
||||
/*
|
||||
* Yank back the headers [hope the device set this
|
||||
@@ -362,7 +364,7 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
@@ -362,7 +365,7 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
* so that this procedure is noop.
|
||||
*/
|
||||
|
||||
|
|
@ -51,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
goto out;
|
||||
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
@@ -538,12 +540,12 @@ static int packet_rcv(struct sk_buff *sk
|
||||
@@ -538,12 +541,12 @@ static int packet_rcv(struct sk_buff *sk
|
||||
int skb_len = skb->len;
|
||||
unsigned int snaplen, res;
|
||||
|
||||
|
|
@ -67,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -659,12 +661,12 @@ static int tpacket_rcv(struct sk_buff *s
|
||||
@@ -659,12 +662,12 @@ static int tpacket_rcv(struct sk_buff *s
|
||||
struct timeval tv;
|
||||
struct timespec ts;
|
||||
|
||||
|
|
@ -83,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -1386,6 +1388,7 @@ static int packet_create(struct net *net
|
||||
@@ -1386,6 +1389,7 @@ static int packet_create(struct net *net
|
||||
spin_lock_init(&po->bind_lock);
|
||||
mutex_init(&po->pg_vec_lock);
|
||||
po->prot_hook.func = packet_rcv;
|
||||
|
|
@ -91,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
|
||||
if (sock->type == SOCK_PACKET)
|
||||
po->prot_hook.func = packet_rcv_spkt;
|
||||
@@ -1731,6 +1734,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
@@ -1731,6 +1735,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
ret = packet_mc_drop(sk, &mreq);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -108,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|||
|
||||
#ifdef CONFIG_PACKET_MMAP
|
||||
case PACKET_RX_RING:
|
||||
@@ -1876,6 +1889,13 @@ static int packet_getsockopt(struct sock
|
||||
@@ -1876,6 +1890,13 @@ static int packet_getsockopt(struct sock
|
||||
|
||||
data = &val;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -11038,14 +11038,14 @@
|
|||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -2620,6 +2620,16 @@ int shmem_lock(struct file *file, int lo
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <linux/mm.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/swap.h>
|
||||
+#include <linux/ima.h>
|
||||
|
||||
static struct vfsmount *shm_mnt;
|
||||
|
||||
@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
|
||||
|
||||
/* common code */
|
||||
|
||||
|
|
@ -17,7 +25,7 @@
|
|||
/**
|
||||
* shmem_file_setup - get an unlinked file living in tmpfs
|
||||
* @name: name for dentry (to be seen in /proc/<pid>/maps
|
||||
@@ -2697,9 +2707,6 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
if (IS_ERR(file))
|
||||
return PTR_ERR(file);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue