Linux 3.18.115
Greg KH
maintainerI'm announcing the release of the 3.18.115 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/x86/lib/cmdline.c | 34 ++++++++--- drivers/atm/zatm.c | 4 - drivers/hid/hid-debug.c | 8 ++ drivers/hid/i2c-hid/i2c-hid.c | 2 drivers/md/dm-bufio.c | 15 ++++- drivers/media/i2c/cx25840/cx25840-core.c | 28 +++++++-- drivers/mtd/chips/cfi_cmdset_0002.c | 30 +++++++--- drivers/mtd/nand/mxc_nand.c | 5 + drivers/mtd/ubi/eba.c | 92 ++++++++++++++++++++++++++++++- drivers/net/ethernet/natsemi/sonic.c | 2 drivers/net/usb/qmi_wwan.c | 1 drivers/scsi/sg.c | 42 +++++++++++++- drivers/staging/android/ion/ion_heap.c | 2 drivers/tty/n_tty.c | 13 ++-- fs/cifs/cifssmb.c | 10 ++- fs/cifs/smb2pdu.c | 18 ++++-- fs/ext4/inline.c | 1 fs/ext4/super.c | 62 +++++++++++++++++--- net/bridge/netfilter/ebtables.c | 3 - net/netfilter/nf_log.c | 9 ++- 21 files changed, 317 insertions(+), 66 deletions(-)
Brad Love (1):
media: cx25840: Use subdev host data for PLL override
Daniel Rosenberg (1):
HID: debug: check length before copy_to_user()
Dave Hansen (1):
x86/boot: Fix early command-line parsing when matching at end
Douglas Anderson (1):
dm bufio: avoid sleeping while holding the dm_bufio lock
Finn Thain (1):
net/sonic: Use dma_mapping_error()
Greg Kroah-Hartman (1):
Linux 3.18.115
Ivan Bornyakov (1):
atm: zatm: fix memcmp casting
Jann Horn (2):
scsi: sg: mitigate read/write abuse
netfilter: nf_log: don't hold nf_log_mutex during user access
Jason Andryuk (1):
HID: i2c-hid: Fix "incomplete report" noise
Josh Hill (1):
net: qmi_wwan: Add Netgear Aircard 779S
Laura Abbott (1):
staging: android: ion: Return an ERR_PTR in ion_map_kernel
Martin Kaiser (1):
mtd: rawnand: mxc: set spare area size register explicitly
Mikulas Patocka (1):
dm bufio: drop the lock when doing GFP_NOIO allocation
Paolo Abeni (1):
netfilter: ebtables: handle string from userspace with care
Paulo Alcantara (1):
cifs: Fix infinite loop when using hard mount option
Richard Weinberger (1):
ubi: fastmap: Correctly handle interrupted erasures in EBA
Tetsuo Handa (1):
n_tty: Fix stall at n_tty_receive_char_special().
Theodore Ts'o (3):
ext4: make sure bitmaps and the inode table don't overlap with bg descriptors
ext4: clear i_data in ext4_inode_info when removing inline data
ext4: add more mount time checks of the superblock
Tokunori Ikegami (3):
mtd: cfi_cmdset_0002: Change definition naming to retry write operation
mtd: cfi_cmdset_0002: Change erase functions to retry for error
mtd: cfi_cmdset_0002: Change erase functions to check chip good only
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 114 +SUBLEVEL = 115 EXTRAVERSION = NAME = Diseased Newt
arch/x86/lib/cmdline.c +24 -10
@@ -21,12 +21,14 @@ static inline int myisspace(u8 c)* @option: option string to look for * * Returns the position of that @option (starts counting with 1) -* or 0 on not found. +* or 0 on not found. @option will only be found if it is found +* as an entire word in @cmdline. For instance, if @option="car" +* then a cmdline which contains "cart" will not match. */ int cmdline_find_option_bool (const char *cmdline,const char *option) {char c; -int len, pos =0 , wstart =0 ; +int pos =0 , wstart =0 ;const char *opptr =NULL ;enum { st_wordstart =0 ,/* Start of word/after whitespace */
@@ -37,11 +39,14 @@ int cmdline_find_option_bool(const char *cmdline, const char *option)if (!cmdline)return -1 ;/* No command line */ - len =min_t (int,strlen (cmdline),COMMAND_LINE_SIZE ); -if (!len) +if (!strlen (cmdline))return 0 ; -while (len--) { +/* +* This 'pos' check ensures we do not overrun +* a non-NULL-terminated 'cmdline' +*/ +while (pos <COMMAND_LINE_SIZE ) { c = *(char *)cmdline++; pos++;
@@ -58,17 +63,26 @@ int cmdline_find_option_bool(const char *cmdline, const char *option)/* fall through */ case st_wordcmp: -if (!*opptr) +if (!*opptr) { +/* +* We matched all the way to the end of the +* option we were looking for. If the +* command-line has a space _or_ ends, then +* we matched! +*/ if (!c ||myisspace (c))return wstart;else state = st_wordskip; -else if (!c) + }else if (!c) { +/* +* Hit the NULL terminator on the end of +* cmdline. +*/ return 0 ; -else if (c != *opptr++) + }else if (c != *opptr++) { state = st_wordskip; -else if (!len)/* last word and is matching */ -return wstart; + }break ;case st_wordskip:
drivers/atm/zatm.c +2 -2
@@ -1148,8 +1148,8 @@ static void eprom_get_byte(struct zatm_dev *zatm_dev, unsigned char *byte, } -static unsigned char eprom_try_esi (struct atm_dev *dev,unsigned short cmd, -int offset,int swap) +static int eprom_try_esi (struct atm_dev *dev,unsigned short cmd,int offset, +int swap) {unsigned char buf[ZEPROM_SIZE ];struct zatm_dev *zatm_dev;
drivers/hid/hid-debug.c +7 -1
@@ -1150,6 +1150,8 @@ copy_rest: goto out;if (list->tail > list->head) { len = list->tail - list->head; +if (len > count) + len = count;if (copy_to_user (buffer + ret, &list->hid_debug_buf[list->head], len)) { ret = -EFAULT ;
@@ -1159,6 +1161,8 @@ copy_rest: list->head += len; }else { len =HID_DEBUG_BUFSIZE - list->head; +if (len > count) + len = count;if (copy_to_user (buffer, &list->hid_debug_buf[list->head], len)) { ret = -EFAULT ;
@@ -1166,7 +1170,9 @@ copy_rest: } list->head =0 ; ret += len; - goto copy_rest; + count -= len; +if (count >0 ) + goto copy_rest; } }
drivers/hid/i2c-hid/i2c-hid.c +1 -1
@@ -399,7 +399,7 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)return ; } -if ((ret_size > size) || (ret_size <=2 )) { +if ((ret_size > size) || (ret_size <2 )) {dev_err (&ihid->client->dev,"%s: incomplete report (%d/%d)\n" , __func__, size, ret_size);return ;
drivers/md/dm-bufio.c +13 -2
@@ -761,12 +761,14 @@ enum new_flag {static struct dm_buffer *__alloc_buffer_wait_no_callback (struct dm_bufio_client *c,enum new_flag nf) {struct dm_buffer *b; +bool tried_noio_alloc = false;/* * dm-bufio is resistant to allocation failures (it just keeps * one buffer reserved in cases all the allocations fail). * So set flags to not try too hard: -* GFP_NOIO: don't recurse into the I/O layer +* GFP_NOWAIT: don't wait; if we need to sleep we'll release our +* mutex and wait ourselves. * __GFP_NORETRY: don't retry and rather return failure * __GFP_NOMEMALLOC: don't use emergency reserves * __GFP_NOWARN: don't print a warning in case of failure
@@ -776,7 +778,7 @@ static struct dm_buffer *__alloc_buffer_wait_no_callback(struct dm_bufio_client*/ while (1 ) {if (dm_bufio_cache_size_latch !=1 ) { - b =alloc_buffer (c,GFP_NOIO | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN); + b =alloc_buffer (c,GFP_NOWAIT | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN);if (b)return b; }
@@ -784,6 +786,15 @@ static struct dm_buffer *__alloc_buffer_wait_no_callback(struct dm_bufio_clientif (nf ==NF_PREFETCH )return NULL ; +if (dm_bufio_cache_size_latch !=1 && !tried_noio_alloc) { +dm_bufio_unlock (c); + b =alloc_buffer (c,GFP_NOIO | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN); +dm_bufio_lock (c); +if (b) +return b; + tried_noio_alloc = true; + } +if (!list_empty (&c->reserved_buffers)) { b =list_entry (c->reserved_buffers.next, struct dm_buffer, lru_list);
drivers/media/i2c/cx25840/cx25840-core.c +22 -6
@@ -467,8 +467,13 @@ static void cx23885_initialize(struct i2c_client *client) {DEFINE_WAIT (wait);struct cx25840_state *state =to_state (i2c_get_clientdata (client)); +u32 clk_freq =0 ;struct workqueue_struct *q; +/* cx23885 sets hostdata to clk_freq pointer */ +if (v4l2_get_subdev_hostdata (&state->sd)) + clk_freq = *((u32 *)v4l2_get_subdev_hostdata (&state->sd)); +/* * Come out of digital power down * The CX23888, at least, needs this, otherwise registers aside from
@@ -504,8 +509,13 @@ static void cx23885_initialize(struct i2c_client *client)* 50.0 MHz * (0xb + 0xe8ba26/0x2000000)/4 = 5 * 28.636363 MHz * 572.73 MHz before post divide */ -/* HVR1850 or 50MHz xtal */ -cx25840_write (client,0x2 ,0x71 ); +if (clk_freq ==25000000 ) { +/* 888/ImpactVCBe or 25Mhz xtal */ + ;/* nothing to do */ + }else { +/* HVR1850 or 50MHz xtal */ +cx25840_write (client,0x2 ,0x71 ); + }cx25840_write4 (client,0x11c ,0x01d1744c );cx25840_write4 (client,0x118 ,0x00000416 );cx25840_write4 (client,0x404 ,0x0010253e );
@@ -548,9 +558,15 @@ static void cx23885_initialize(struct i2c_client *client)/* HVR1850 */ switch (state->id) {case CX23888_AV : -/* 888/HVR1250 specific */ -cx25840_write4 (client,0x10c ,0x13333333 ); -cx25840_write4 (client,0x108 ,0x00000515 ); +if (clk_freq ==25000000 ) { +/* 888/ImpactVCBe or 25MHz xtal */ +cx25840_write4 (client,0x10c ,0x01b6db7b ); +cx25840_write4 (client,0x108 ,0x00000512 ); + }else { +/* 888/HVR1250 or 50MHz xtal */ +cx25840_write4 (client,0x10c ,0x13333333 ); +cx25840_write4 (client,0x108 ,0x00000515 ); + }break ;default :cx25840_write4 (client,0x10c ,0x002be2c9 );
@@ -577,7 +593,7 @@ static void cx23885_initialize(struct i2c_client *client)* 368.64 MHz before post divide * 122.88 MHz / 0xa = 12.288 MHz */ -/* HVR1850 or 50MHz xtal */ +/* HVR1850 or 50MHz xtal or 25MHz xtal */ cx25840_write4 (client,0x114 ,0x017dbf48 );cx25840_write4 (client,0x110 ,0x000a030e );break ;
drivers/mtd/chips/cfi_cmdset_0002.c +21 -9
@@ -42,7 +42,7 @@#define AMD_BOOTLOC_BUG #define FORCE_WORD_WRITE 0 -#define MAX_WORD_RETRIES 3 +#define MAX_RETRIES 3#define SST49LF004B 0x0060#define SST49LF040B 0x0050
@@ -1645,7 +1645,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,map_write ( map,CMD (0xF0 ), chip->start );/* FIXME - should have reset delay before continuing */ -if (++retry_cnt <=MAX_WORD_RETRIES ) +if (++retry_cnt <=MAX_RETRIES ) goto retry; ret = -EIO ;
@@ -2104,7 +2104,7 @@ retry:map_write (map,CMD (0xF0 ), chip->start);/* FIXME - should have reset delay before continuing */ -if (++retry_cnt <=MAX_WORD_RETRIES ) +if (++retry_cnt <=MAX_RETRIES ) goto retry; ret = -EIO ;
@@ -2239,6 +2239,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)unsigned long int adr;DECLARE_WAITQUEUE (wait, current);int ret =0 ; +int retry_cnt =0 ; adr = cfi->addr_unlock1;
@@ -2256,6 +2257,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)ENABLE_VPP (map);xip_disable (map, chip, adr); + retry:cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type,NULL );cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type,NULL );cfi_send_gen_cmd (0x80 , cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type,NULL );
@@ -2292,12 +2294,13 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) chip->erase_suspended =0 ; } -if (chip_ready (map, adr)) +if (chip_good (map, adr,map_word_ff (map)))break ;if (time_after (jiffies, timeo)) {printk (KERN_WARNING "MTD %s(): software timeout\n" , __func__ ); + ret = -EIO ;break ; }
@@ -2305,12 +2308,15 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)UDELAY (map, chip, adr,1000000 /HZ ); }/* Did we succeed? */ -if (!chip_good (map, adr,map_word_ff (map))) { +if (ret) {/* reset on all failures. */ map_write ( map,CMD (0xF0 ), chip->start );/* FIXME - should have reset delay before continuing */ - ret = -EIO ; +if (++retry_cnt <=MAX_RETRIES ) { + ret =0 ; + goto retry; + } } chip->state =FL_READY ;
@@ -2329,6 +2335,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,unsigned long timeo = jiffies +HZ ;DECLARE_WAITQUEUE (wait, current);int ret =0 ; +int retry_cnt =0 ; adr += chip->start;
@@ -2346,6 +2353,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,ENABLE_VPP (map);xip_disable (map, chip, adr); + retry:cfi_send_gen_cmd (0xAA , cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type,NULL );cfi_send_gen_cmd (0x55 , cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type,NULL );cfi_send_gen_cmd (0x80 , cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type,NULL );
@@ -2382,7 +2390,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, chip->erase_suspended =0 ; } -if (chip_ready (map, adr)) { +if (chip_good (map, adr,map_word_ff (map))) {xip_enable (map, chip, adr);break ; }
@@ -2391,6 +2399,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,xip_enable (map, chip, adr);printk (KERN_WARNING "MTD %s(): software timeout\n" , __func__ ); + ret = -EIO ;break ; }
@@ -2398,12 +2407,15 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,UDELAY (map, chip, adr,1000000 /HZ ); }/* Did we succeed? */ -if (!chip_good (map, adr,map_word_ff (map))) { +if (ret) {/* reset on all failures. */ map_write ( map,CMD (0xF0 ), chip->start );/* FIXME - should have reset delay before continuing */ - ret = -EIO ; +if (++retry_cnt <=MAX_RETRIES ) { + ret =0 ; + goto retry; + } } chip->state =FL_READY ;
drivers/mtd/nand/mxc_nand.c +4 -1
@@ -49,7 +49,7 @@#define NFC_V1_V2_CONFIG (host->regs + 0x0a)#define NFC_V1_V2_ECC_STATUS_RESULT (host->regs + 0x0c)#define NFC_V1_V2_RSLTMAIN_AREA (host->regs + 0x0e) -#define NFC_V1_V2_RSLTSPARE_AREA (host->regs + 0x10) +#define NFC_V21_RSLTSPARE_AREA (host->regs + 0x10)#define NFC_V1_V2_WRPROT (host->regs + 0x12)#define NFC_V1_UNLOCKSTART_BLKADDR (host->regs + 0x14)#define NFC_V1_UNLOCKEND_BLKADDR (host->regs + 0x16)
@@ -958,6 +958,9 @@ static void preset_v2(struct mtd_info *mtd)writew (config1,NFC_V1_V2_CONFIG1 );/* preset operation */ +/* spare area size in 16-bit half-words */ +writew (mtd->oobsize /2 ,NFC_V21_RSLTSPARE_AREA ); +/* Unlock the internal RAM Buffer */ writew (0x2 ,NFC_V1_V2_CONFIG );
drivers/mtd/ubi/eba.c +91 -1
110 lines not on this page · raw message
drivers/net/ethernet/natsemi/sonic.c +1 -1
@@ -71,7 +71,7 @@ static int sonic_open(struct net_device *dev)for (i =0 ; i <SONIC_NUM_RRS ; i++) {dma_addr_t laddr =dma_map_single (lp->device,skb_put (lp->rx_skb[i],SONIC_RBSIZE ),SONIC_RBSIZE ,DMA_FROM_DEVICE ); -if (!laddr) { +if (dma_mapping_error (lp->device, laddr)) {while (i >0 ) {/* free any that were mapped successfully */ i--;dma_unmap_single (lp->device, lp->rx_laddr[i],SONIC_RBSIZE ,DMA_FROM_DEVICE );
drivers/net/usb/qmi_wwan.c +1 -0
@@ -677,6 +677,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x05c6, 0x920d, 0)}, {QMI_FIXED_INTF(0x05c6, 0x920d, 5)}, {QMI_FIXED_INTF(0x0846, 0x68a2, 8)}, + {QMI_FIXED_INTF(0x0846, 0x68d3, 8)}, /* Netgear Aircard 779S */ {QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */ {QMI_FIXED_INTF(0x12d1, 0x14ac, 1)}, /* Huawei E1820 */ {QMI_FIXED_INTF(0x1435, 0xd181, 3)}, /* Wistron NeWeb D18Q1 */
drivers/scsi/sg.c +40 -2
67 lines not on this page · raw message
drivers/staging/android/ion/ion_heap.c +1 -1
@@ -38,7 +38,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap,struct page **tmp = pages;if (!pages) -return NULL ; +return ERR_PTR (-ENOMEM );if (buffer->flags &ION_FLAG_CACHED ) pgprot =PAGE_KERNEL ;
drivers/tty/n_tty.c +8 -5
@@ -127,6 +127,8 @@ struct n_tty_data {struct mutex output_lock; }; +#define MASK (x) ((x) & (N_TTY_BUF_SIZE - 1)) +static inline size_t read_cnt (struct n_tty_data *ldata) {return ldata->read_head - ldata->read_tail;
@@ -1032,14 +1034,15 @@ static void eraser(unsigned char c, struct tty_struct *tty) } seen_alnums =0 ; -while (ldata->read_head != ldata->canon_head) { +while (MASK (ldata->read_head) !=MASK (ldata->canon_head)) { head = ldata->read_head;/* erase a single possibly multibyte character */ do { head--; c =read_buf (ldata, head); - }while (is_continuation (c, tty) && head != ldata->canon_head); + }while (is_continuation (c, tty) && +MASK (head) !=MASK (ldata->canon_head));/* do not partially erase */ if (is_continuation (c, tty))
@@ -1081,7 +1084,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)* This info is used to go back the correct * number of columns. */ -while (tail != ldata->canon_head) { +while (MASK (tail) !=MASK (ldata->canon_head)) { tail--; c =read_buf (ldata, tail);if (c =='\t' ) {
@@ -1341,7 +1344,7 @@ n_tty_receive_char_special(struct tty_struct *tty, unsigned char c)finish_erasing (ldata);echo_char (c, tty);echo_char_raw ('\n' , ldata); -while (tail != ldata->read_head) { +while (MASK (tail) !=MASK (ldata->read_head)) {echo_char (read_buf (ldata, tail), tty); tail++; }
@@ -2505,7 +2508,7 @@ static unsigned long inq_canon(struct n_tty_data *ldata) tail = ldata->read_tail; nr = head - tail;/* Skip EOF-chars.. */ -while (head != tail) { +while (MASK (head) !=MASK (tail)) {if (test_bit (tail & (N_TTY_BUF_SIZE -1 ), ldata->read_flags) &&read_buf (ldata, tail) == __DISABLED_CHAR) nr--;
fs/cifs/cifssmb.c +8 -2
@@ -150,8 +150,14 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command)* greater than cifs socket timeout which is 7 seconds */ while (server->tcpStatus == CifsNeedReconnect) { -wait_event_interruptible_timeout (server->response_q, - (server->tcpStatus != CifsNeedReconnect),10 *HZ ); + rc =wait_event_interruptible_timeout (server->response_q, + (server->tcpStatus != CifsNeedReconnect), +10 *HZ ); +if (rc <0 ) { +cifs_dbg (FYI ,"%s: aborting reconnect due to a received" +" signal by the process\n" , __func__); +return -ERESTARTSYS ; + }/* are we still trying to reconnect? */ if (server->tcpStatus != CifsNeedReconnect)
fs/cifs/smb2pdu.c +12 -6
@@ -144,7 +144,7 @@ out:static int smb2_reconnect (__le16 smb2_command,struct cifs_tcon *tcon) { -int rc =0 ; +int rc;struct nls_table *nls_codepage;struct cifs_ses *ses;struct TCP_Server_Info *server;
@@ -155,10 +155,10 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)* for those three - in the calling routine. */ if (tcon ==NULL ) -return rc; +return 0 ;if (smb2_command ==SMB2_TREE_CONNECT ) -return rc; +return 0 ;if (tcon->tidStatus == CifsExiting) {/*
@@ -201,8 +201,14 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)return -EAGAIN ; } -wait_event_interruptible_timeout (server->response_q, - (server->tcpStatus != CifsNeedReconnect),10 *HZ ); + rc =wait_event_interruptible_timeout (server->response_q, + (server->tcpStatus != CifsNeedReconnect), +10 *HZ ); +if (rc <0 ) { +cifs_dbg (FYI ,"%s: aborting reconnect due to a received" +" signal by the process\n" , __func__); +return -ERESTARTSYS ; + }/* are we still trying to reconnect? */ if (server->tcpStatus != CifsNeedReconnect)
@@ -220,7 +226,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon) }if (!tcon->ses->need_reconnect && !tcon->need_reconnect) -return rc; +return 0 ; nls_codepage =load_nls_default ();
fs/ext4/inline.c +1 -0
@@ -432,6 +432,7 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle,memset ((void *)ext4_raw_inode (&is.iloc)->i_block,0 ,EXT4_MIN_INLINE_DATA_SIZE ); +memset (ei->i_data,0 ,EXT4_MIN_INLINE_DATA_SIZE );if (EXT4_HAS_INCOMPAT_FEATURE (inode->i_sb,EXT4_FEATURE_INCOMPAT_EXTENTS )) {
fs/ext4/super.c +51 -11
116 lines not on this page · raw message
net/bridge/netfilter/ebtables.c +2 -1
@@ -1910,7 +1910,8 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,int off, pad =0 ;unsigned int size_kern, match_size = mwt->match_size; -strlcpy (name, mwt->u.name,sizeof (name)); +if (strscpy (name, mwt->u.name,sizeof (name)) <0 ) +return -EINVAL ;if (state->buf_kern_start) dst = state->buf_kern_start + state->buf_kern_offset;
net/netfilter/nf_log.c +6 -3
@@ -387,14 +387,17 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,rcu_assign_pointer (net->nf.nf_loggers[tindex], logger);mutex_unlock (&nf_log_mutex); }else { +struct ctl_table tmp = *table; + + tmp.data = buf;mutex_lock (&nf_log_mutex); logger =nft_log_dereference (net->nf.nf_loggers[tindex]);if (!logger) - table->data ="NONE" ; +strlcpy (buf,"NONE" ,sizeof (buf));else - table->data = logger->name; - r =proc_dostring (table, write, buffer, lenp, ppos); +strlcpy (buf, logger->name,sizeof (buf));mutex_unlock (&nf_log_mutex); + r =proc_dostring (&tmp, write, buffer, lenp, ppos); }return r;