Revision ebaad1322d8080a1a8367ec631b345405d9879e2 authored by Daniel Verkamp on 13 May 2015, 22:50:04 UTC, committed by Jon Mason on 11 June 2015, 13:27:24 UTC
Commit ab760a0 (ntb: Adding split BAR support for Haswell platforms) changed ntb_device's mw from a fixed-size array into a pointer that is allocated based on limits.max_mw; however, on Atom platforms, max_mw is not initialized until ntb_device_setup(), which happens after the allocation. Fill out max_mw in ntb_atom_detect() to match ntb_xeon_detect(); this happens before the use of max_mw in the ndev->mw allocation. Fixes a null pointer dereference on Atom platforms with ntb hardware. v2: fix typo (mw_max should be max_mw) Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Acked-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
1 parent 2f4eb6a
do_mounts.h
#include <linux/kernel.h>
#include <linux/blkdev.h>
#include <linux/init.h>
#include <linux/syscalls.h>
#include <linux/unistd.h>
#include <linux/slab.h>
#include <linux/mount.h>
#include <linux/major.h>
#include <linux/root_dev.h>
void change_floppy(char *fmt, ...);
void mount_block_root(char *name, int flags);
void mount_root(void);
extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
{
sys_unlink(name);
return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
}
#if BITS_PER_LONG == 32
static inline u32 bstat(char *name)
{
struct stat64 stat;
if (sys_stat64(name, &stat) != 0)
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
if (stat.st_rdev != (u32)stat.st_rdev)
return 0;
return stat.st_rdev;
}
#else
static inline u32 bstat(char *name)
{
struct stat stat;
if (sys_newstat(name, &stat) != 0)
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
return stat.st_rdev;
}
#endif
#ifdef CONFIG_BLK_DEV_RAM
int __init rd_load_disk(int n);
int __init rd_load_image(char *from);
#else
static inline int rd_load_disk(int n) { return 0; }
static inline int rd_load_image(char *from) { return 0; }
#endif
#ifdef CONFIG_BLK_DEV_INITRD
int __init initrd_load(void);
#else
static inline int initrd_load(void) { return 0; }
#endif
#ifdef CONFIG_BLK_DEV_MD
void md_run_setup(void);
#else
static inline void md_run_setup(void) {}
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...