This is the 3.10.95 stable release
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWowK8AAoJEDjbvchgkmk+sFIP/3HvyY47jKTX7ykzRa78wJZK 0ihPIOzV1OjgjvfRQZ4d6olGDMDuP5YbSAc0gHlIy71FO/cP7uPYSKZI9IrJAwSB ZEovaAS05nhbA1UuJFZo9V7JVYSc4IXNH/QoMvzJS+Zrpr0v0tlnxQSvP3kaeQpL Z5dbSd27XyzPp7gYM87Bn+OMkI1tPl+addyhqe7YwJ3MM7OUluLsZYxf30exoPjH bdckbaXVi1U+WUzA1OI7XboOuKQZh6NT+ZixheB7EQPvbN5kxZRDQKtNJWjnk24d ycU0KfGC1VntMULWhwJnn+elTxrQf0aVWkJcZM6xBri+g0BmGIli1DAD1WyYj3c7 NSPDlTiNFcm95SUgDpB2PvT7Bue6T/0kRadpZJNgpjZgLtVMXo0r62Lo9Y11Y9Oa jRqSf7f7BsUJ+X3SDylcXXL60uiz5DOLpAyMp8TmI9JBh1hTymUhiHcEHR9iSUz+ 0QOw6P/XKfIXVe0qhzSeWXaRCKIFZIwWrNMztfj2U/SZtAmsoQ76Lpx2jCf/nqGz 3IFAQ/dVhcfLRvOrcYPKFsMDWiLKMJNVTeKe2a9ywh8WCWajROfZvozm856dY42F gUTUn2MsAnm2T+wNnYcFZo0y2i8EaA4FfjEYfoUeEgyIDqc3w8+YjvgCFwDldLr4 oMm63KBsozCC09L5rRpU =8AjQ -----END PGP SIGNATURE----- Merge tag 'v3.10.95' into HEAD This is the 3.10.95 stable release Change-Id: I3b35d689a2e42fb39ddf132b7ba5414b0ff2fc4b
This commit is contained in:
commit
08d8c47ec4
2
Makefile
2
Makefile
|
@ -1,6 +1,6 @@
|
|||
VERSION = 3
|
||||
PATCHLEVEL = 10
|
||||
SUBLEVEL = 94
|
||||
SUBLEVEL = 95
|
||||
EXTRAVERSION =
|
||||
NAME = TOSSUG Baby Fish
|
||||
|
||||
|
|
|
@ -3670,6 +3670,11 @@ static int pci_probe(struct pci_dev *dev,
|
|||
|
||||
reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);
|
||||
ohci->it_context_support = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);
|
||||
/* JMicron JMB38x often shows 0 at first read, just ignore it */
|
||||
if (!ohci->it_context_support) {
|
||||
ohci_notice(ohci, "overriding IsoXmitIntMask\n");
|
||||
ohci->it_context_support = 0xf;
|
||||
}
|
||||
reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);
|
||||
ohci->it_context_mask = ohci->it_context_support;
|
||||
ohci->n_it = hweight32(ohci->it_context_mask);
|
||||
|
|
|
@ -1016,13 +1016,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
|
|||
sizeof(struct atl1c_recv_ret_status) * rx_desc_count +
|
||||
8 * 4;
|
||||
|
||||
ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,
|
||||
&ring_header->dma);
|
||||
ring_header->desc = dma_zalloc_coherent(&pdev->dev, ring_header->size,
|
||||
&ring_header->dma, GFP_KERNEL);
|
||||
if (unlikely(!ring_header->desc)) {
|
||||
dev_err(&pdev->dev, "pci_alloc_consistend failed\n");
|
||||
dev_err(&pdev->dev, "could not get memory for DMA buffer\n");
|
||||
goto err_nomem;
|
||||
}
|
||||
memset(ring_header->desc, 0, ring_header->size);
|
||||
/* init TPD ring */
|
||||
|
||||
tpd_ring[0].dma = roundup(ring_header->dma, 8);
|
||||
|
|
|
@ -1421,6 +1421,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
|
|||
desc_status >>= 16;
|
||||
#endif
|
||||
|
||||
skb = mdp->rx_skbuff[entry];
|
||||
if (desc_status & (RD_RFS1 | RD_RFS2 | RD_RFS3 | RD_RFS4 |
|
||||
RD_RFS5 | RD_RFS6 | RD_RFS10)) {
|
||||
ndev->stats.rx_errors++;
|
||||
|
@ -1436,12 +1437,11 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
|
|||
ndev->stats.rx_missed_errors++;
|
||||
if (desc_status & RD_RFS10)
|
||||
ndev->stats.rx_over_errors++;
|
||||
} else {
|
||||
} else if (skb) {
|
||||
if (!mdp->cd->hw_swap)
|
||||
sh_eth_soft_swap(
|
||||
phys_to_virt(ALIGN(rxdesc->addr, 4)),
|
||||
pkt_len + 2);
|
||||
skb = mdp->rx_skbuff[entry];
|
||||
mdp->rx_skbuff[entry] = NULL;
|
||||
if (mdp->cd->rpadir)
|
||||
skb_reserve(skb, NET_IP_ALIGN);
|
||||
|
|
|
@ -848,7 +848,7 @@ static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
|
|||
{ PHY_ID_BCM5421, 0xfffffff0 },
|
||||
{ PHY_ID_BCM5461, 0xfffffff0 },
|
||||
{ PHY_ID_BCM5464, 0xfffffff0 },
|
||||
{ PHY_ID_BCM5482, 0xfffffff0 },
|
||||
{ PHY_ID_BCM5481, 0xfffffff0 },
|
||||
{ PHY_ID_BCM5482, 0xfffffff0 },
|
||||
{ PHY_ID_BCM50610, 0xfffffff0 },
|
||||
{ PHY_ID_BCM50610M, 0xfffffff0 },
|
||||
|
|
|
@ -742,6 +742,7 @@ static const struct usb_device_id products[] = {
|
|||
{QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */
|
||||
{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */
|
||||
{QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */
|
||||
{QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */
|
||||
{QMI_FIXED_INTF(0x0b3c, 0xc000, 4)}, /* Olivetti Olicard 100 */
|
||||
{QMI_FIXED_INTF(0x0b3c, 0xc001, 4)}, /* Olivetti Olicard 120 */
|
||||
{QMI_FIXED_INTF(0x0b3c, 0xc002, 4)}, /* Olivetti Olicard 140 */
|
||||
|
|
|
@ -1749,6 +1749,11 @@ static const struct usb_device_id acm_ids[] = {
|
|||
},
|
||||
#endif
|
||||
|
||||
/* Exclude Infineon Flash Loader utility */
|
||||
{ USB_DEVICE(0x058b, 0x0041),
|
||||
.driver_info = IGNORE_DEVICE,
|
||||
},
|
||||
|
||||
/* control interfaces without any protocol set */
|
||||
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
|
||||
USB_CDC_PROTO_NONE) },
|
||||
|
|
|
@ -117,7 +117,8 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
|
|||
USB_SS_MULT(desc->bmAttributes) > 3) {
|
||||
dev_warn(ddev, "Isoc endpoint has Mult of %d in "
|
||||
"config %d interface %d altsetting %d ep %d: "
|
||||
"setting to 3\n", desc->bmAttributes + 1,
|
||||
"setting to 3\n",
|
||||
USB_SS_MULT(desc->bmAttributes),
|
||||
cfgno, inum, asnum, ep->desc.bEndpointAddress);
|
||||
ep->ss_ep_comp.bmAttributes = 2;
|
||||
}
|
||||
|
|
|
@ -138,6 +138,10 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev)
|
|||
|
||||
static int usb_device_supports_lpm(struct usb_device *udev)
|
||||
{
|
||||
/* Some devices have trouble with LPM */
|
||||
if (udev->quirks & USB_QUIRK_NO_LPM)
|
||||
return 0;
|
||||
|
||||
/* USB 2.1 (and greater) devices indicate LPM support through
|
||||
* their USB 2.0 Extended Capabilities BOS descriptor.
|
||||
*/
|
||||
|
@ -4432,6 +4436,8 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
|
|||
goto fail;
|
||||
}
|
||||
|
||||
usb_detect_quirks(udev);
|
||||
|
||||
if (udev->wusb == 0 && le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0201) {
|
||||
retval = usb_get_bos_descriptor(udev);
|
||||
if (!retval) {
|
||||
|
@ -4673,7 +4679,6 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
|
|||
if (status < 0)
|
||||
goto loop;
|
||||
|
||||
usb_detect_quirks(udev);
|
||||
if (udev->quirks & USB_QUIRK_DELAY_INIT)
|
||||
msleep(1000);
|
||||
|
||||
|
|
|
@ -185,6 +185,12 @@ static const struct usb_device_id usb_interface_quirk_list[] = {
|
|||
{ USB_DEVICE(0x0b05, 0x17e0), .driver_info =
|
||||
USB_QUIRK_IGNORE_REMOTE_WAKEUP },
|
||||
|
||||
/* Blackmagic Design Intensity Shuttle */
|
||||
{ USB_DEVICE(0x1edb, 0xbd3b), .driver_info = USB_QUIRK_NO_LPM },
|
||||
|
||||
/* Blackmagic Design UltraStudio SDI */
|
||||
{ USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
|
||||
|
||||
{ } /* terminating entry must be last */
|
||||
};
|
||||
|
||||
|
|
|
@ -377,6 +377,10 @@ static int qset_fill_page_list(struct whc *whc, struct whc_std *std, gfp_t mem_f
|
|||
if (std->pl_virt == NULL)
|
||||
return -ENOMEM;
|
||||
std->dma_addr = dma_map_single(whc->wusbhc.dev, std->pl_virt, pl_len, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(whc->wusbhc.dev, std->dma_addr)) {
|
||||
kfree(std->pl_virt);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
for (p = 0; p < std->num_pointers; p++) {
|
||||
std->pl_virt[p].buf_ptr = cpu_to_le64(dma_addr);
|
||||
|
|
|
@ -132,7 +132,6 @@ static const struct usb_device_id id_table[] = {
|
|||
{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
|
||||
{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
|
||||
{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
|
||||
{ USB_DEVICE(0x10C4, 0xEA80) }, /* Silicon Labs factory default */
|
||||
{ USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
|
||||
{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
|
||||
{ USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */
|
||||
|
|
|
@ -1286,8 +1286,14 @@ next_slot:
|
|||
num_bytes = 0;
|
||||
btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
|
||||
|
||||
if (found_key.objectid > ino ||
|
||||
found_key.type > BTRFS_EXTENT_DATA_KEY ||
|
||||
if (found_key.objectid > ino)
|
||||
break;
|
||||
if (WARN_ON_ONCE(found_key.objectid < ino) ||
|
||||
found_key.type < BTRFS_EXTENT_DATA_KEY) {
|
||||
path->slots[0]++;
|
||||
goto next_slot;
|
||||
}
|
||||
if (found_key.type > BTRFS_EXTENT_DATA_KEY ||
|
||||
found_key.offset > end)
|
||||
break;
|
||||
|
||||
|
|
|
@ -406,9 +406,13 @@ static void ext4_handle_error(struct super_block *sb, char* buf)
|
|||
ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
|
||||
sb->s_flags |= MS_RDONLY;
|
||||
}
|
||||
if (test_opt(sb, ERRORS_PANIC))
|
||||
panic("EXT4-fs (device %s): panic! %s\n",
|
||||
sb->s_id, buf?buf:"no message");
|
||||
if (test_opt(sb, ERRORS_PANIC)) {
|
||||
if (EXT4_SB(sb)->s_journal &&
|
||||
!(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR))
|
||||
return;
|
||||
panic("EXT4-fs (device %s): panic forced after error\n",
|
||||
sb->s_id);
|
||||
}
|
||||
}
|
||||
|
||||
void __ext4_error(struct super_block *sb, const char *function,
|
||||
|
@ -621,8 +625,12 @@ void __ext4_abort(struct super_block *sb, const char *function,
|
|||
jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
|
||||
save_error_info(sb, function, line);
|
||||
}
|
||||
if (test_opt(sb, ERRORS_PANIC) && !ignore_fs_panic)
|
||||
if (test_opt(sb, ERRORS_PANIC)) {
|
||||
if (EXT4_SB(sb)->s_journal &&
|
||||
!(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR))
|
||||
return;
|
||||
panic("EXT4-fs panic from previous error\n");
|
||||
}
|
||||
}
|
||||
|
||||
void ext4_msg(struct super_block *sb, const char *prefix, const char *fmt, ...)
|
||||
|
|
|
@ -2043,8 +2043,12 @@ static void __journal_abort_soft (journal_t *journal, int errno)
|
|||
|
||||
__jbd2_journal_abort_hard(journal);
|
||||
|
||||
if (errno)
|
||||
if (errno) {
|
||||
jbd2_journal_update_sb_errno(journal);
|
||||
write_lock(&journal->j_state_lock);
|
||||
journal->j_flags |= JBD2_REC_ERR;
|
||||
write_unlock(&journal->j_state_lock);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1503,7 +1503,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|||
nfsi->attrtimeo_timestamp = now;
|
||||
}
|
||||
}
|
||||
invalid &= ~NFS_INO_INVALID_ATTR;
|
||||
|
||||
/* Don't declare attrcache up to date if there were no attrs! */
|
||||
if (fattr->valid != 0)
|
||||
invalid &= ~NFS_INO_INVALID_ATTR;
|
||||
|
||||
/* Don't invalidate the data if we were to blame */
|
||||
if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)
|
||||
|| S_ISLNK(inode->i_mode)))
|
||||
|
|
|
@ -32,7 +32,7 @@ static int nfs_get_cb_ident_idr(struct nfs_client *clp, int minorversion)
|
|||
return ret;
|
||||
idr_preload(GFP_KERNEL);
|
||||
spin_lock(&nn->nfs_client_lock);
|
||||
ret = idr_alloc(&nn->cb_ident_idr, clp, 0, 0, GFP_NOWAIT);
|
||||
ret = idr_alloc(&nn->cb_ident_idr, clp, 1, 0, GFP_NOWAIT);
|
||||
if (ret >= 0)
|
||||
clp->cl_cb_ident = ret;
|
||||
spin_unlock(&nn->nfs_client_lock);
|
||||
|
|
|
@ -993,6 +993,7 @@ struct journal_s
|
|||
#define JBD2_ABORT_ON_SYNCDATA_ERR 0x040 /* Abort the journal on file
|
||||
* data write error in ordered
|
||||
* mode */
|
||||
#define JBD2_REC_ERR 0x080 /* The errno in the sb has been recorded */
|
||||
|
||||
/*
|
||||
* Function declarations for the journaling transaction and buffer
|
||||
|
|
|
@ -35,4 +35,7 @@
|
|||
/* device generates spurious wakeup, ignore remote wakeup capability */
|
||||
#define USB_QUIRK_IGNORE_REMOTE_WAKEUP 0x00000200
|
||||
|
||||
/* device can't handle Link Power Management */
|
||||
#define USB_QUIRK_NO_LPM BIT(10)
|
||||
|
||||
#endif /* __LINUX_USB_QUIRKS_H */
|
||||
|
|
|
@ -505,6 +505,7 @@ struct ip6_create_arg {
|
|||
u32 user;
|
||||
const struct in6_addr *src;
|
||||
const struct in6_addr *dst;
|
||||
int iif;
|
||||
u8 ecn;
|
||||
};
|
||||
|
||||
|
|
|
@ -686,6 +686,8 @@ enum sock_flags {
|
|||
SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
|
||||
};
|
||||
|
||||
#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
|
||||
|
||||
static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
|
||||
{
|
||||
nsk->sk_flags = osk->sk_flags;
|
||||
|
|
|
@ -312,6 +312,8 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
|
|||
err = put_user(cmlen, &cm->cmsg_len);
|
||||
if (!err) {
|
||||
cmlen = CMSG_SPACE(i*sizeof(int));
|
||||
if (msg->msg_controllen < cmlen)
|
||||
cmlen = msg->msg_controllen;
|
||||
msg->msg_control += cmlen;
|
||||
msg->msg_controllen -= cmlen;
|
||||
}
|
||||
|
|
|
@ -428,8 +428,6 @@ static void sock_warn_obsolete_bsdism(const char *name)
|
|||
}
|
||||
}
|
||||
|
||||
#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
|
||||
|
||||
static void sock_disable_timestamp(struct sock *sk, unsigned long flags)
|
||||
{
|
||||
if (sk->sk_flags & flags) {
|
||||
|
|
|
@ -309,6 +309,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
|
|||
if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
|
||||
build_ehash_secret();
|
||||
|
||||
if (protocol < 0 || protocol >= IPPROTO_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
sock->state = SS_UNCONNECTED;
|
||||
|
||||
/* Look for the requested type/protocol pair. */
|
||||
|
|
|
@ -136,7 +136,7 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
|
|||
struct mfc_cache *c, struct rtmsg *rtm);
|
||||
static void mroute_netlink_event(struct mr_table *mrt, struct mfc_cache *mfc,
|
||||
int cmd);
|
||||
static void mroute_clean_tables(struct mr_table *mrt);
|
||||
static void mroute_clean_tables(struct mr_table *mrt, bool all);
|
||||
static void ipmr_expire_process(unsigned long arg);
|
||||
|
||||
#ifdef CONFIG_IP_MROUTE_MULTIPLE_TABLES
|
||||
|
@ -348,7 +348,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
|
|||
static void ipmr_free_table(struct mr_table *mrt)
|
||||
{
|
||||
del_timer_sync(&mrt->ipmr_expire_timer);
|
||||
mroute_clean_tables(mrt);
|
||||
mroute_clean_tables(mrt, true);
|
||||
kfree(mrt);
|
||||
}
|
||||
|
||||
|
@ -1199,7 +1199,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
|
|||
* Close the multicast socket, and clear the vif tables etc
|
||||
*/
|
||||
|
||||
static void mroute_clean_tables(struct mr_table *mrt)
|
||||
static void mroute_clean_tables(struct mr_table *mrt, bool all)
|
||||
{
|
||||
int i;
|
||||
LIST_HEAD(list);
|
||||
|
@ -1208,8 +1208,9 @@ static void mroute_clean_tables(struct mr_table *mrt)
|
|||
/* Shut down all active vif entries */
|
||||
|
||||
for (i = 0; i < mrt->maxvif; i++) {
|
||||
if (!(mrt->vif_table[i].flags & VIFF_STATIC))
|
||||
vif_delete(mrt, i, 0, &list);
|
||||
if (!all && (mrt->vif_table[i].flags & VIFF_STATIC))
|
||||
continue;
|
||||
vif_delete(mrt, i, 0, &list);
|
||||
}
|
||||
unregister_netdevice_many(&list);
|
||||
|
||||
|
@ -1217,7 +1218,7 @@ static void mroute_clean_tables(struct mr_table *mrt)
|
|||
|
||||
for (i = 0; i < MFC_LINES; i++) {
|
||||
list_for_each_entry_safe(c, next, &mrt->mfc_cache_array[i], list) {
|
||||
if (c->mfc_flags & MFC_STATIC)
|
||||
if (!all && (c->mfc_flags & MFC_STATIC))
|
||||
continue;
|
||||
list_del_rcu(&c->list);
|
||||
mroute_netlink_event(mrt, c, RTM_DELROUTE);
|
||||
|
@ -1252,7 +1253,7 @@ static void mrtsock_destruct(struct sock *sk)
|
|||
NETCONFA_IFINDEX_ALL,
|
||||
net->ipv4.devconf_all);
|
||||
RCU_INIT_POINTER(mrt->mroute_sk, NULL);
|
||||
mroute_clean_tables(mrt);
|
||||
mroute_clean_tables(mrt, false);
|
||||
}
|
||||
}
|
||||
rtnl_unlock();
|
||||
|
|
|
@ -5585,6 +5585,7 @@ discard:
|
|||
}
|
||||
|
||||
tp->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
|
||||
tp->copied_seq = tp->rcv_nxt;
|
||||
tp->rcv_wup = TCP_SKB_CB(skb)->seq + 1;
|
||||
|
||||
/* RFC1323: The window in SYN & SYN/ACK segments is
|
||||
|
|
|
@ -1015,7 +1015,8 @@ int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
|
|||
}
|
||||
|
||||
md5sig = rcu_dereference_protected(tp->md5sig_info,
|
||||
sock_owned_by_user(sk));
|
||||
sock_owned_by_user(sk) ||
|
||||
lockdep_is_held(&sk->sk_lock.slock));
|
||||
if (!md5sig) {
|
||||
md5sig = kmalloc(sizeof(*md5sig), gfp);
|
||||
if (!md5sig)
|
||||
|
|
|
@ -134,6 +134,9 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
|
|||
!inet_ehash_secret)
|
||||
build_ehash_secret();
|
||||
|
||||
if (protocol < 0 || protocol >= IPPROTO_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
/* Look for the requested type/protocol pair. */
|
||||
lookup_protocol:
|
||||
err = -ESOCKTNOSUPPORT;
|
||||
|
|
|
@ -1541,13 +1541,11 @@ static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[],
|
|||
return -EEXIST;
|
||||
} else {
|
||||
t = nt;
|
||||
|
||||
ip6gre_tunnel_unlink(ign, t);
|
||||
ip6gre_tnl_change(t, &p, !tb[IFLA_MTU]);
|
||||
ip6gre_tunnel_link(ign, t);
|
||||
netdev_state_change(dev);
|
||||
}
|
||||
|
||||
ip6gre_tunnel_unlink(ign, t);
|
||||
ip6gre_tnl_change(t, &p, !tb[IFLA_MTU]);
|
||||
ip6gre_tunnel_link(ign, t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ static void mr6_netlink_event(struct mr6_table *mrt, struct mfc6_cache *mfc,
|
|||
int cmd);
|
||||
static int ip6mr_rtm_dumproute(struct sk_buff *skb,
|
||||
struct netlink_callback *cb);
|
||||
static void mroute_clean_tables(struct mr6_table *mrt);
|
||||
static void mroute_clean_tables(struct mr6_table *mrt, bool all);
|
||||
static void ipmr_expire_process(unsigned long arg);
|
||||
|
||||
#ifdef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
|
||||
|
@ -337,7 +337,7 @@ static struct mr6_table *ip6mr_new_table(struct net *net, u32 id)
|
|||
static void ip6mr_free_table(struct mr6_table *mrt)
|
||||
{
|
||||
del_timer(&mrt->ipmr_expire_timer);
|
||||
mroute_clean_tables(mrt);
|
||||
mroute_clean_tables(mrt, true);
|
||||
kfree(mrt);
|
||||
}
|
||||
|
||||
|
@ -1537,7 +1537,7 @@ static int ip6mr_mfc_add(struct net *net, struct mr6_table *mrt,
|
|||
* Close the multicast socket, and clear the vif tables etc
|
||||
*/
|
||||
|
||||
static void mroute_clean_tables(struct mr6_table *mrt)
|
||||
static void mroute_clean_tables(struct mr6_table *mrt, bool all)
|
||||
{
|
||||
int i;
|
||||
LIST_HEAD(list);
|
||||
|
@ -1547,8 +1547,9 @@ static void mroute_clean_tables(struct mr6_table *mrt)
|
|||
* Shut down all active vif entries
|
||||
*/
|
||||
for (i = 0; i < mrt->maxvif; i++) {
|
||||
if (!(mrt->vif6_table[i].flags & VIFF_STATIC))
|
||||
mif6_delete(mrt, i, &list);
|
||||
if (!all && (mrt->vif6_table[i].flags & VIFF_STATIC))
|
||||
continue;
|
||||
mif6_delete(mrt, i, &list);
|
||||
}
|
||||
unregister_netdevice_many(&list);
|
||||
|
||||
|
@ -1557,7 +1558,7 @@ static void mroute_clean_tables(struct mr6_table *mrt)
|
|||
*/
|
||||
for (i = 0; i < MFC6_LINES; i++) {
|
||||
list_for_each_entry_safe(c, next, &mrt->mfc6_cache_array[i], list) {
|
||||
if (c->mfc_flags & MFC_STATIC)
|
||||
if (!all && (c->mfc_flags & MFC_STATIC))
|
||||
continue;
|
||||
write_lock_bh(&mrt_lock);
|
||||
list_del(&c->list);
|
||||
|
@ -1620,7 +1621,7 @@ int ip6mr_sk_done(struct sock *sk)
|
|||
net->ipv6.devconf_all);
|
||||
write_unlock_bh(&mrt_lock);
|
||||
|
||||
mroute_clean_tables(mrt);
|
||||
mroute_clean_tables(mrt, false);
|
||||
err = 0;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -1441,7 +1441,6 @@ out:
|
|||
if (!err) {
|
||||
ICMP6MSGOUT_INC_STATS(net, idev, ICMPV6_MLD2_REPORT);
|
||||
ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
|
||||
IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, payload_len);
|
||||
} else {
|
||||
IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
|
||||
}
|
||||
|
@ -1805,7 +1804,6 @@ out:
|
|||
if (!err) {
|
||||
ICMP6MSGOUT_INC_STATS(net, idev, type);
|
||||
ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
|
||||
IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, full_len);
|
||||
} else
|
||||
IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
|
||||
|
||||
|
|
|
@ -172,7 +172,7 @@ static void nf_ct_frag6_expire(unsigned long data)
|
|||
/* Creation primitives. */
|
||||
static inline struct frag_queue *fq_find(struct net *net, __be32 id,
|
||||
u32 user, struct in6_addr *src,
|
||||
struct in6_addr *dst, u8 ecn)
|
||||
struct in6_addr *dst, int iif, u8 ecn)
|
||||
{
|
||||
struct inet_frag_queue *q;
|
||||
struct ip6_create_arg arg;
|
||||
|
@ -182,6 +182,7 @@ static inline struct frag_queue *fq_find(struct net *net, __be32 id,
|
|||
arg.user = user;
|
||||
arg.src = src;
|
||||
arg.dst = dst;
|
||||
arg.iif = iif;
|
||||
arg.ecn = ecn;
|
||||
|
||||
read_lock_bh(&nf_frags.lock);
|
||||
|
@ -590,7 +591,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
|
|||
local_bh_enable();
|
||||
|
||||
fq = fq_find(net, fhdr->identification, user, &hdr->saddr, &hdr->daddr,
|
||||
ip6_frag_ecn(hdr));
|
||||
skb->dev ? skb->dev->ifindex : 0, ip6_frag_ecn(hdr));
|
||||
if (fq == NULL) {
|
||||
pr_debug("Can't find and can't create new queue\n");
|
||||
goto ret_orig;
|
||||
|
|
|
@ -111,7 +111,10 @@ bool ip6_frag_match(struct inet_frag_queue *q, void *a)
|
|||
return fq->id == arg->id &&
|
||||
fq->user == arg->user &&
|
||||
ipv6_addr_equal(&fq->saddr, arg->src) &&
|
||||
ipv6_addr_equal(&fq->daddr, arg->dst);
|
||||
ipv6_addr_equal(&fq->daddr, arg->dst) &&
|
||||
(arg->iif == fq->iif ||
|
||||
!(ipv6_addr_type(arg->dst) & (IPV6_ADDR_MULTICAST |
|
||||
IPV6_ADDR_LINKLOCAL)));
|
||||
}
|
||||
EXPORT_SYMBOL(ip6_frag_match);
|
||||
|
||||
|
@ -180,7 +183,7 @@ static void ip6_frag_expire(unsigned long data)
|
|||
|
||||
static __inline__ struct frag_queue *
|
||||
fq_find(struct net *net, __be32 id, const struct in6_addr *src,
|
||||
const struct in6_addr *dst, u8 ecn)
|
||||
const struct in6_addr *dst, int iif, u8 ecn)
|
||||
{
|
||||
struct inet_frag_queue *q;
|
||||
struct ip6_create_arg arg;
|
||||
|
@ -190,6 +193,7 @@ fq_find(struct net *net, __be32 id, const struct in6_addr *src,
|
|||
arg.user = IP6_DEFRAG_LOCAL_DELIVER;
|
||||
arg.src = src;
|
||||
arg.dst = dst;
|
||||
arg.iif = iif;
|
||||
arg.ecn = ecn;
|
||||
|
||||
read_lock(&ip6_frags.lock);
|
||||
|
@ -558,7 +562,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
|
|||
IPSTATS_MIB_REASMFAILS, evicted);
|
||||
|
||||
fq = fq_find(net, fhdr->identification, &hdr->saddr, &hdr->daddr,
|
||||
ip6_frag_ecn(hdr));
|
||||
skb->dev ? skb->dev->ifindex : 0, ip6_frag_ecn(hdr));
|
||||
if (fq != NULL) {
|
||||
int ret;
|
||||
|
||||
|
|
|
@ -1108,6 +1108,9 @@ static int irda_create(struct net *net, struct socket *sock, int protocol,
|
|||
|
||||
IRDA_DEBUG(2, "%s()\n", __func__);
|
||||
|
||||
if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
if (net != &init_net)
|
||||
return -EAFNOSUPPORT;
|
||||
|
||||
|
|
|
@ -812,8 +812,8 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,
|
|||
if (!has_sha1)
|
||||
return -EINVAL;
|
||||
|
||||
memcpy(ep->auth_hmacs_list->hmac_ids, &hmacs->shmac_idents[0],
|
||||
hmacs->shmac_num_idents * sizeof(__u16));
|
||||
for (i = 0; i < hmacs->shmac_num_idents; i++)
|
||||
ep->auth_hmacs_list->hmac_ids[i] = htons(hmacs->shmac_idents[i]);
|
||||
ep->auth_hmacs_list->param_hdr.length = htons(sizeof(sctp_paramhdr_t) +
|
||||
hmacs->shmac_num_idents * sizeof(__u16));
|
||||
return 0;
|
||||
|
|
|
@ -639,6 +639,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,
|
|||
struct sock *newsk;
|
||||
struct ipv6_pinfo *newnp, *np = inet6_sk(sk);
|
||||
struct sctp6_sock *newsctp6sk;
|
||||
struct ipv6_txoptions *opt;
|
||||
|
||||
newsk = sk_alloc(sock_net(sk), PF_INET6, GFP_KERNEL, sk->sk_prot);
|
||||
if (!newsk)
|
||||
|
@ -658,6 +659,13 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,
|
|||
|
||||
memcpy(newnp, np, sizeof(struct ipv6_pinfo));
|
||||
|
||||
rcu_read_lock();
|
||||
opt = rcu_dereference(np->opt);
|
||||
if (opt)
|
||||
opt = ipv6_dup_options(newsk, opt);
|
||||
RCU_INIT_POINTER(newnp->opt, opt);
|
||||
rcu_read_unlock();
|
||||
|
||||
/* Initialize sk's sport, dport, rcv_saddr and daddr for getsockname()
|
||||
* and getpeername().
|
||||
*/
|
||||
|
|
|
@ -6970,6 +6970,9 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
|
|||
newinet->mc_ttl = 1;
|
||||
newinet->mc_index = 0;
|
||||
newinet->mc_list = NULL;
|
||||
|
||||
if (newsk->sk_flags & SK_FLAGS_TIMESTAMP)
|
||||
net_enable_timestamp();
|
||||
}
|
||||
|
||||
static inline void sctp_copy_descendant(struct sock *sk_to,
|
||||
|
@ -7150,6 +7153,13 @@ struct proto sctp_prot = {
|
|||
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
|
||||
#include <net/transp_v6.h>
|
||||
static void sctp_v6_destroy_sock(struct sock *sk)
|
||||
{
|
||||
sctp_destroy_sock(sk);
|
||||
inet6_destroy_sock(sk);
|
||||
}
|
||||
|
||||
struct proto sctpv6_prot = {
|
||||
.name = "SCTPv6",
|
||||
.owner = THIS_MODULE,
|
||||
|
@ -7159,7 +7169,7 @@ struct proto sctpv6_prot = {
|
|||
.accept = sctp_accept,
|
||||
.ioctl = sctp_ioctl,
|
||||
.init = sctp_init_sock,
|
||||
.destroy = sctp_destroy_sock,
|
||||
.destroy = sctp_v6_destroy_sock,
|
||||
.shutdown = sctp_shutdown,
|
||||
.setsockopt = sctp_setsockopt,
|
||||
.getsockopt = sctp_getsockopt,
|
||||
|
|
|
@ -340,7 +340,7 @@ found:
|
|||
*/
|
||||
|
||||
static int unix_dgram_peer_wake_relay(wait_queue_t *q, unsigned mode, int flags,
|
||||
void *key)
|
||||
void *key)
|
||||
{
|
||||
struct unix_sock *u;
|
||||
wait_queue_head_t *u_sleep;
|
||||
|
@ -348,7 +348,7 @@ static int unix_dgram_peer_wake_relay(wait_queue_t *q, unsigned mode, int flags,
|
|||
u = container_of(q, struct unix_sock, peer_wake);
|
||||
|
||||
__remove_wait_queue(&unix_sk(u->peer_wake.private)->peer_wait,
|
||||
q);
|
||||
q);
|
||||
u->peer_wake.private = NULL;
|
||||
|
||||
/* relaying can only happen while the wq still exists */
|
||||
|
@ -381,7 +381,7 @@ static int unix_dgram_peer_wake_connect(struct sock *sk, struct sock *other)
|
|||
}
|
||||
|
||||
static void unix_dgram_peer_wake_disconnect(struct sock *sk,
|
||||
struct sock *other)
|
||||
struct sock *other)
|
||||
{
|
||||
struct unix_sock *u, *u_other;
|
||||
|
||||
|
@ -398,13 +398,13 @@ static void unix_dgram_peer_wake_disconnect(struct sock *sk,
|
|||
}
|
||||
|
||||
static void unix_dgram_peer_wake_disconnect_wakeup(struct sock *sk,
|
||||
struct sock *other)
|
||||
struct sock *other)
|
||||
{
|
||||
unix_dgram_peer_wake_disconnect(sk, other);
|
||||
wake_up_interruptible_poll(sk_sleep(sk),
|
||||
POLLOUT |
|
||||
POLLWRNORM |
|
||||
POLLWRBAND);
|
||||
POLLOUT |
|
||||
POLLWRNORM |
|
||||
POLLWRBAND);
|
||||
}
|
||||
|
||||
/* preconditions:
|
||||
|
@ -426,7 +426,7 @@ static int unix_dgram_peer_wake_me(struct sock *sk, struct sock *other)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int unix_writable(const struct sock *sk)
|
||||
static inline int unix_writable(struct sock *sk)
|
||||
{
|
||||
return (atomic_read(&sk->sk_wmem_alloc) << 2) <= sk->sk_sndbuf;
|
||||
}
|
||||
|
@ -1946,14 +1946,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|||
if (flags&MSG_OOB)
|
||||
goto out;
|
||||
|
||||
err = mutex_lock_interruptible(&u->readlock);
|
||||
if (unlikely(err)) {
|
||||
/* recvmsg() in non blocking mode is supposed to return -EAGAIN
|
||||
* sk_rcvtimeo is not honored by mutex_lock_interruptible()
|
||||
*/
|
||||
err = noblock ? -EAGAIN : -ERESTARTSYS;
|
||||
goto out;
|
||||
}
|
||||
mutex_lock(&u->readlock);
|
||||
|
||||
skip = sk_peek_offset(sk, flags);
|
||||
|
||||
|
@ -2150,12 +2143,12 @@ again:
|
|||
|
||||
timeo = unix_stream_data_wait(sk, timeo, last);
|
||||
|
||||
if (signal_pending(current)
|
||||
|| mutex_lock_interruptible(&u->readlock)) {
|
||||
if (signal_pending(current)) {
|
||||
err = sock_intr_errno(timeo);
|
||||
goto out;
|
||||
}
|
||||
|
||||
mutex_lock(&u->readlock);
|
||||
continue;
|
||||
unlock:
|
||||
unix_state_unlock(sk);
|
||||
|
|
Loading…
Reference in New Issue