Linux 2.6.27.4
Subsystems (23)
We (the -stable team) are announcing the release of the 2.6.27.4 kernel.
It contains a wide range of bugfixes, and all users of the 2.6.27 kernel series are strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.27.3 and 2.6.27.4
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/x86/kernel/acpi/sleep.c | 3 + arch/x86/kernel/amd_iommu_init.c | 2 drivers/acpi/hardware/hwsleep.c | 37 ++++----------- drivers/acpi/sleep/main.c | 10 ++++ drivers/char/hvc_console.c | 10 ++-- drivers/edac/cell_edac.c | 2 drivers/gpio/gpiolib.c | 2 drivers/md/dm-kcopyd.c | 13 +++++ drivers/md/dm-snap.c | 10 +--- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 -- drivers/pci/hotplug/cpqphp_core.c | 2 drivers/scsi/device_handler/scsi_dh_rdac.c | 2 drivers/usb/atm/speedtch.c | 12 +++++ drivers/usb/class/cdc-acm.c | 3 - drivers/usb/class/cdc-wdm.c | 2 drivers/usb/core/driver.c | 3 - drivers/usb/core/hub.c | 2 fs/cifs/readdir.c | 3 - fs/ext2/dir.c | 60 ++++++++++++++----------- fs/ext3/dir.c | 10 ++-- fs/ext4/dir.c | 11 +++- fs/proc/task_mmu.c | 34 +++++++++----- kernel/sched_stats.h | 2 mm/rmap.c | 42 +++++++++++++---- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 net/ipv4/netfilter/nf_nat_snmp_basic.c | 1 net/netfilter/xt_iprange.c | 8 +-- 28 files changed, 184 insertions(+), 112 deletions(-)
Alan Stern (2):
USB: don't rebind drivers after failed resume or reset
USB: Speedtouch: add pre_reset and post_reset routines
Alexey Dobriyan (1):
netfilter: xt_iprange: fix range inversion match
Andreas Herrmann (1):
amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors
Benjamin Herrenschmidt (1):
edac cell: fix incorrect edac_mode
Christian Borntraeger (1):
hvc_console: Fix free_irq in spinlocked section
David Brownell (1):
gpiolib: fix oops in gpio_get_value_cansleep()
Eric Sandeen (1):
ext[234]: Avoid printk floods in the face of directory corruption (CVE-2008-3528)
Greg Kroah-Hartman (1):
Linux 2.6.27.4
Ilpo Järvinen (1):
netfilter: snmp nat leaks memory in case of failure
Jeff Layton (1):
CIFS: fix saving of resume key before CIFSFindNext
Joe Korty (1):
proc: fix vma display mismatch between /proc/pid/{maps,smaps}Kazuo Ito (1):
dm kcopyd: avoid queue shuffle
Kenji Kaneshige (1):
PCI hotplug: cpqphp: fix kernel NULL pointer dereference
Linus Torvalds (1):
anon_vma_prepare: properly lock even newly allocated entries
Miao Xie (1):
sched: fix the wrong mask_len
Mike Isely (1):
V4L/DVB (9300): pvrusb2: Fix deadlock problem
Mikulas Patocka (1):
dm snapshot: fix primary_pe race
Oliver Neukum (2):
USB: cdc-wdm: make module autoload work
USB: fix memory leak in cdc-acm
Patrick McHardy (1):
netfilter: restore lost ifdef guarding defrag exception
Rafael J. Wysocki (4):
x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel ACPI Suspend: Enable ACPI during resume if SCI_EN is not set ACPI suspend: Blacklist HP xw4600 Workstation for old code ordering ACPI suspend: Always use the 32-bit waking vector
[email protected] (1):
SCSI: scsi_dh: add Dell product information into rdac device handler
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .3 +EXTRAVERSION = .4 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/x86/kernel/acpi/sleep.c +3 -0
@@ -10,6 +10,7 @@#include <linux/dmi.h> #include <linux/cpumask.h> #include <asm/segment.h> +#include <asm/desc.h> #include "realmode/wakeup.h" #include "sleep.h"
@@ -98,6 +99,8 @@ int acpi_save_state_mem(void) header->trampoline_segment =setup_trampoline () >>4 ;#ifdef CONFIG_SMP stack_start.sp = temp_stack +4096 ; + early_gdt_descr.address = + (unsigned long )get_cpu_gdt_table (smp_processor_id ());#endif initial_code = (unsigned long )wakeup_long64; saved_magic =0x123456789abcdef0 ;
arch/x86/kernel/amd_iommu_init.c +1 -1
@@ -210,7 +210,7 @@ static void __init iommu_set_exclusion_range(struct amd_iommu *iommu)/* Programs the physical address of the device table into the IOMMU hardware */ static void __init iommu_set_device_table (struct amd_iommu *iommu) { -u32 entry; +u64 entry;BUG_ON (iommu->mmio_base ==NULL );
drivers/acpi/hardware/hwsleep.c +11 -26
@@ -78,19 +78,17 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address)return_ACPI_STATUS (status); } -/* Set the vector */ +/* +* According to the ACPI specification 2.0c and later, the 64-bit +* waking vector should be cleared and the 32-bit waking vector should +* be used, unless we want the wake-up code to be called by the BIOS in +* Protected Mode. Some systems (for example HP dv5-1004nr) are known +* to fail to resume if the 64-bit vector is used. +*/ +if (facs->version >=1 ) + facs->xfirmware_waking_vector =0 ; -if ((facs->length <32 ) || (!(facs->xfirmware_waking_vector))) { -/* -* ACPI 1.0 FACS or short table or optional X_ field is zero -*/ - facs->firmware_waking_vector = (u32 ) physical_address; - }else { -/* -* ACPI 2.0 FACS with valid X_ field -*/ - facs->xfirmware_waking_vector = physical_address; - } + facs->firmware_waking_vector = (u32 )physical_address;return_ACPI_STATUS (AE_OK ); }
@@ -134,20 +132,7 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address) }/* Get the vector */ - -if ((facs->length <32 ) || (!(facs->xfirmware_waking_vector))) { -/* -* ACPI 1.0 FACS or short table or optional X_ field is zero -*/ - *physical_address = - (acpi_physical_address ) facs->firmware_waking_vector; - }else { -/* -* ACPI 2.0 FACS with valid X_ field -*/ - *physical_address = - (acpi_physical_address ) facs->xfirmware_waking_vector; - } + *physical_address = (acpi_physical_address )facs->firmware_waking_vector;return_ACPI_STATUS (AE_OK ); }
drivers/acpi/sleep/main.c +10 -0
@@ -200,6 +200,8 @@ static int acpi_suspend_enter(suspend_state_t pm_state)break ; } +/* If ACPI is not enabled by the BIOS, we need to enable it here. */ +acpi_enable ();/* Reprogram control registers and execute _BFS */ acpi_leave_sleep_state_prep (acpi_state);
@@ -296,6 +298,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"), }, }, + { + .callback = init_old_suspend_ordering, + .ident = "HP xw4600 Workstation", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"), + }, + }, {}, };#endif /* CONFIG_SUSPEND */
drivers/char/hvc_console.c +5 -5
@@ -367,13 +367,13 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)spin_lock_irqsave (&hp->lock, flags);if (--hp->count ==0 ) { -if (hp->ops->notifier_del) - hp->ops->notifier_del (hp, hp->data); -/* We are done with the tty pointer now. */ hp->tty =NULL ;spin_unlock_irqrestore (&hp->lock, flags); +if (hp->ops->notifier_del) + hp->ops->notifier_del (hp, hp->data); +/* * Chain calls chars_in_buffer() and returns immediately if * there is no buffered data otherwise sleeps on a wait queue
@@ -416,11 +416,11 @@ static void hvc_hangup(struct tty_struct *tty) hp->n_outbuf =0 ; hp->tty =NULL ; +spin_unlock_irqrestore (&hp->lock, flags); +if (hp->ops->notifier_del) hp->ops->notifier_del (hp, hp->data); -spin_unlock_irqrestore (&hp->lock, flags); -while (temp_open_count) { --temp_open_count;kref_put (&hp->kref, destroy_hvc_struct);
drivers/edac/cell_edac.c +1 -1
@@ -142,7 +142,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) csrow->nr_pages = (r.end - r.start +1 ) >>PAGE_SHIFT ; csrow->last_page = csrow->first_page + csrow->nr_pages -1 ; csrow->mtype =MEM_XDR ; - csrow->edac_mode =EDAC_FLAG_EC |EDAC_FLAG_SECDED ; + csrow->edac_mode =EDAC_SECDED ; dev_dbg(mci->dev, "Initialized on node %d, chanmask=0x%x," " first_page=0x%lx, nr_pages=0x%x\n",
drivers/gpio/gpiolib.c +1 -1
@@ -1020,7 +1020,7 @@ int gpio_get_value_cansleep(unsigned gpio)might_sleep_if (extra_checks); chip =gpio_to_chip (gpio); -return chip->get (chip, gpio - chip->base); +return chip->get ? chip->get (chip, gpio - chip->base) :0 ; }EXPORT_SYMBOL_GPL (gpio_get_value_cansleep);
drivers/md/dm-kcopyd.c +12 -1
@@ -268,6 +268,17 @@ static void push(struct list_head *jobs, struct kcopyd_job *job)spin_unlock_irqrestore (&kc->job_lock, flags); } + +static void push_head (struct list_head *jobs,struct kcopyd_job *job) +{ +unsigned long flags; +struct dm_kcopyd_client *kc = job->kc; + +spin_lock_irqsave (&kc->job_lock, flags); +list_add (&job->list, jobs); +spin_unlock_irqrestore (&kc->job_lock, flags); +} +/* * These three functions process 1 item from the corresponding * job list.
@@ -398,7 +409,7 @@ static int process_jobs(struct list_head *jobs, struct dm_kcopyd_client *kc,* We couldn't service this job ATM, so * push this job back onto the list. */ -push (jobs, job); +push_head (jobs, job);break ; }
drivers/md/dm-snap.c +3 -7
@@ -824,8 +824,10 @@ static struct bio *put_pending_exception(struct dm_snap_pending_exception *pe)* the bios for the original write to the origin. */ if (primary_pe && -atomic_dec_and_test (&primary_pe->ref_count)) +atomic_dec_and_test (&primary_pe->ref_count)) { origin_bios =bio_list_get (&primary_pe->origin_bios); +free_pending_exception (primary_pe); + }/* * Free the pe if it's not linked to an origin write or if
@@ -834,12 +836,6 @@ static struct bio *put_pending_exception(struct dm_snap_pending_exception *pe)if (!primary_pe || primary_pe != pe)free_pending_exception (pe); -/* -* Free the primary pe if nothing references it. -*/ -if (primary_pe && !atomic_read (&primary_pe->ref_count)) -free_pending_exception (primary_pe); -return origin_bios; }
drivers/media/video/pvrusb2/pvrusb2-hdw.c +0 -6
@@ -60,7 +60,6 @@ static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL};static DEFINE_MUTEX (pvr2_unit_mtx);static int ctlchg; -static int initusbreset =1 ;static int procreload;static int tuner[PVR_NUM ] = { [0 ...PVR_NUM -1 ] =-1 };static int tolerance[PVR_NUM ] = { [0 ...PVR_NUM -1 ] =0 };
@@ -71,8 +70,6 @@ module_param(ctlchg, int, S_IRUGO|S_IWUSR);MODULE_PARM_DESC (ctlchg,"0=optimize ctl change 1=always accept new ctl value" );module_param (init_pause_msec, int,S_IRUGO |S_IWUSR );MODULE_PARM_DESC (init_pause_msec,"hardware initialization settling delay" ); -module_param (initusbreset, int,S_IRUGO |S_IWUSR ); -MODULE_PARM_DESC (initusbreset,"Do USB reset device on probe" );module_param (procreload, int,S_IRUGO |S_IWUSR );MODULE_PARM_DESC (procreload,"Attempt init failure recovery with firmware reload" );
@@ -1698,9 +1695,6 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw) } hdw->fw1_state =FW1_STATE_OK ; -if (initusbreset) { -pvr2_hdw_device_reset (hdw); - }if (!pvr2_hdw_dev_ok (hdw))return ;for (idx =0 ; idx < hdw->hdw_desc->client_modules.cnt; idx++) {
drivers/pci/hotplug/cpqphp_core.c +1 -1
@@ -435,7 +435,7 @@ static int ctrl_slot_setup(struct controller *ctrl, slot->number, ctrl->slot_device_offset, slot_number); result =pci_hp_register (hotplug_slot, - ctrl->pci_dev->subordinate, + ctrl->pci_dev->bus, slot->device);if (result) {err ("pci_hp_register failed with error %d\n" , result);
drivers/scsi/device_handler/scsi_dh_rdac.c +2 -0
@@ -590,6 +590,8 @@ static const struct scsi_dh_devlist rdac_dev_list[] = { {"STK", "OPENstorage D280"}, {"SUN", "CSM200_R"}, {"SUN", "LCSM100_F"}, + {"DELL", "MD3000"}, + {"DELL", "MD3000i"}, {NULL, NULL}, };
drivers/usb/atm/speedtch.c +12 -0
@@ -722,6 +722,16 @@ static void speedtch_atm_stop(struct usbatm_data *usbatm, struct atm_dev *atm_deflush_scheduled_work (); } +static int speedtch_pre_reset (struct usb_interface *intf) +{ +return 0 ; +} + +static int speedtch_post_reset (struct usb_interface *intf) +{ +return 0 ; +} +/********** ** USB **
@@ -740,6 +750,8 @@ static struct usb_driver speedtch_usb_driver = { .name = speedtch_driver_name, .probe = speedtch_usb_probe, .disconnect = usbatm_usb_disconnect, + .pre_reset = speedtch_pre_reset, + .post_reset = speedtch_post_reset, .id_table = speedtch_usb_ids };
drivers/usb/class/cdc-acm.c +2 -1
@@ -849,9 +849,10 @@ static void acm_write_buffers_free(struct acm *acm) {int i;struct acm_wb *wb; +struct usb_device *usb_dev =interface_to_usbdev (acm->control);for (wb = &acm->wb[0 ], i =0 ; i <ACM_NW ; i++, wb++) { -usb_buffer_free (acm->dev, acm->writesize, wb->buf, wb->dmah); +usb_buffer_free (usb_dev, acm->writesize, wb->buf, wb->dmah); } }
drivers/usb/class/cdc-wdm.c +2 -0
@@ -42,6 +42,8 @@ static struct usb_device_id wdm_ids[] = { { } }; +MODULE_DEVICE_TABLE (usb, wdm_ids); +#define WDM_MINOR_BASE 176
drivers/usb/core/driver.c +2 -1
@@ -1609,7 +1609,8 @@ int usb_external_resume_device(struct usb_device *udev) status =usb_resume_both (udev); udev->last_busy = jiffies;usb_pm_unlock (udev); -do_unbind_rebind (udev,DO_REBIND ); +if (status ==0 ) +do_unbind_rebind (udev,DO_REBIND );/* Now that the device is awake, we can start trying to autosuspend * it again. */
drivers/usb/core/hub.c +1 -1
@@ -3424,7 +3424,7 @@ int usb_reset_device(struct usb_device *udev) USB_INTERFACE_BOUND) rebind =1 ; } -if (rebind) +if (ret ==0 && rebind)usb_rebind_intf (cintf); } }
fs/cifs/readdir.c +2 -1
@@ -762,14 +762,15 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, rc));return rc; } +cifs_save_resume_key (cifsFile->srch_inf.last_entry, cifsFile); }while ((index_to_find >= cifsFile->srch_inf.index_of_last_entry) && (rc ==0 ) && !cifsFile->srch_inf.endOfSearch) {cFYI (1 , ("calling findnext2" )); -cifs_save_resume_key (cifsFile->srch_inf.last_entry, cifsFile); rc =CIFSFindNext (xid, pTcon, cifsFile->netfid, &cifsFile->srch_inf); +cifs_save_resume_key (cifsFile->srch_inf.last_entry, cifsFile);if (rc)return -ENOENT ; }
fs/ext2/dir.c +35 -25
139 lines not on this page · raw message
fs/ext3/dir.c +7 -3
@@ -102,6 +102,7 @@ static int ext3_readdir(struct file * filp,int err;struct inode *inode = filp->f_path.dentry->d_inode;int ret =0 ; +int dir_has_error =0 ; sb = inode->i_sb;
@@ -148,9 +149,12 @@ static int ext3_readdir(struct file * filp,* of recovering data when there's a bad sector */ if (!bh) { -ext3_error (sb,"ext3_readdir" , -"directory #%lu contains a hole at offset %lu" , - inode->i_ino, (unsigned long )filp->f_pos); +if (!dir_has_error) { +ext3_error (sb, __func__,"directory #%lu " +"contains a hole at offset %lld" , + inode->i_ino, filp->f_pos); + dir_has_error =1 ; + }/* corrupt size? Maybe no more blocks to read */ if (filp->f_pos > inode->i_blocks <<9 )break ;
fs/ext4/dir.c +8 -3
@@ -102,6 +102,7 @@ static int ext4_readdir(struct file * filp,int err;struct inode *inode = filp->f_path.dentry->d_inode;int ret =0 ; +int dir_has_error =0 ; sb = inode->i_sb;
@@ -148,9 +149,13 @@ static int ext4_readdir(struct file * filp,* of recovering data when there's a bad sector */ if (!bh) { -ext4_error (sb,"ext4_readdir" , -"directory #%lu contains a hole at offset %lu" , - inode->i_ino, (unsigned long )filp->f_pos); +if (!dir_has_error) { +ext4_error (sb, __func__,"directory #%lu " +"contains a hole at offset %Lu" , + inode->i_ino, + (unsigned long long ) filp->f_pos); + dir_has_error =1 ; + }/* corrupt size? Maybe no more blocks to read */ if (filp->f_pos > inode->i_blocks <<9 )break ;
fs/proc/task_mmu.c +22 -12
@@ -198,11 +198,8 @@ static int do_maps_open(struct inode *inode, struct file *file,return ret; } -static int show_map (struct seq_file *m,void *v) +static void show_map_vma (struct seq_file *m,struct vm_area_struct *vma) { -struct proc_maps_private *priv = m->private; -struct task_struct *task = priv->task; -struct vm_area_struct *vma = v;struct mm_struct *mm = vma->vm_mm;struct file *file = vma->vm_file;int flags = vma->vm_flags;
@@ -210,9 +207,6 @@ static int show_map(struct seq_file *m, void *v)dev_t dev =0 ;int len; -if (maps_protect && !ptrace_may_access (task,PTRACE_MODE_READ )) -return -EACCES ; -if (file) {struct inode *inode = vma->vm_file->f_path.dentry->d_inode; dev = inode->i_sb->s_dev;
@@ -257,6 +251,18 @@ static int show_map(struct seq_file *m, void *v) } }seq_putc (m,'\n' ); +} + +static int show_map (struct seq_file *m,void *v) +{ +struct vm_area_struct *vma = v; +struct proc_maps_private *priv = m->private; +struct task_struct *task = priv->task; + +if (maps_protect && !ptrace_may_access (task,PTRACE_MODE_READ )) +return -EACCES ; + +show_map_vma (m, vma);if (m->count < m->size)/* vma is copied successfully */ m->version = (vma !=get_gate_vma (task))? vma->vm_start:0 ;
@@ -367,23 +373,25 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,static int show_smap (struct seq_file *m,void *v) { +struct proc_maps_private *priv = m->private; +struct task_struct *task = priv->task;struct vm_area_struct *vma = v;struct mem_size_stats mss; -int ret;struct mm_walk smaps_walk = { .pmd_entry = smaps_pte_range, .mm = vma->vm_mm, .private = &mss, }; +if (maps_protect && !ptrace_may_access (task,PTRACE_MODE_READ )) +return -EACCES ; +memset (&mss,0 ,sizeof mss); mss.vma = vma;if (vma->vm_mm && !is_vm_hugetlb_page (vma))walk_page_range (vma->vm_start, vma->vm_end, &smaps_walk); - ret =show_map (m, v); -if (ret) -return ret; +show_map_vma (m, vma);seq_printf (m, "Size: %8lu kB\n"
@@ -405,7 +413,9 @@ static int show_smap(struct seq_file *m, void *v) mss.referenced >>10 , mss.swap >> 10); -return ret; +if (m->count < m->size)/* vma is copied successfully */ + m->version = (vma !=get_gate_vma (task)) ? vma->vm_start :0 ; +return 0 ; }static const struct seq_operations proc_pid_smaps_op = {
kernel/sched_stats.h +1 -1
@@ -9,7 +9,7 @@static int show_schedstat (struct seq_file *seq,void *v) {int cpu; -int mask_len =NR_CPUS /32 *9 ; +int mask_len = (NR_CPUS /32 +1 ) *9 ;char *mask_str =kmalloc (mask_len,GFP_KERNEL );if (mask_str ==NULL )
mm/rmap.c +32 -10
67 lines not on this page · raw message
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +2 -0
@@ -150,10 +150,12 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum, const struct net_device *out, int (*okfn)(struct sk_buff *)) { +#if !defined(CONFIG_NF_NAT ) && !defined(CONFIG_NF_NAT_MODULE )/* Previously seen (loopback)? Ignore. Do this before fragment check. */ if (skb->nfct)return NF_ACCEPT ; +#endif /* Gather fragments. */ if (ip_hdr (skb)->frag_off &htons (IP_MF |IP_OFFSET )) {
net/ipv4/netfilter/nf_nat_snmp_basic.c +1 -0
@@ -742,6 +742,7 @@ static unsigned char snmp_object_decode(struct asn1_ctx *ctx, *obj =kmalloc (sizeof (struct snmp_object ) + len,GFP_ATOMIC );if (*obj ==NULL ) { +kfree (p);kfree (id);if (net_ratelimit ())printk ("OOM in bsalg (%d)\n" , __LINE__);
net/netfilter/xt_iprange.c +4 -4
@@ -67,7 +67,7 @@ iprange_mt4(const struct sk_buff *skb, const struct net_device *in,if (info->flags &IPRANGE_SRC ) { m =ntohl (iph->saddr) <ntohl (info->src_min.ip); m |=ntohl (iph->saddr) >ntohl (info->src_max.ip); - m ^= info->flags &IPRANGE_SRC_INV ; + m ^= !!(info->flags &IPRANGE_SRC_INV );if (m) { pr_debug("src IP " NIPQUAD_FMT " NOT in range %s" NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -81,7 +81,7 @@ iprange_mt4(const struct sk_buff *skb, const struct net_device *in,if (info->flags &IPRANGE_DST ) { m =ntohl (iph->daddr) <ntohl (info->dst_min.ip); m |=ntohl (iph->daddr) >ntohl (info->dst_max.ip); - m ^= info->flags &IPRANGE_DST_INV ; + m ^= !!(info->flags &IPRANGE_DST_INV );if (m) { pr_debug("dst IP " NIPQUAD_FMT " NOT in range %s" NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -123,14 +123,14 @@ iprange_mt6(const struct sk_buff *skb, const struct net_device *in,if (info->flags &IPRANGE_SRC ) { m =iprange_ipv6_sub (&iph->saddr, &info->src_min.in6) <0 ; m |=iprange_ipv6_sub (&iph->saddr, &info->src_max.in6) >0 ; - m ^= info->flags &IPRANGE_SRC_INV ; + m ^= !!(info->flags &IPRANGE_SRC_INV );if (m)return false; }if (info->flags &IPRANGE_DST ) { m =iprange_ipv6_sub (&iph->daddr, &info->dst_min.in6) <0 ; m |=iprange_ipv6_sub (&iph->daddr, &info->dst_max.in6) >0 ; - m ^= info->flags &IPRANGE_DST_INV ; + m ^= !!(info->flags &IPRANGE_DST_INV );if (m)return false; }