3.2.54-rc1 review
Subsystems (2)
PATCH 159/185 net: rework recvmsg handler msg_name and msg_namelen logic
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit f3d3342602f8bcbf37d7c46641cb9bca7618eb1c ]
This patch now always passes msg->msg_namelen as 0. recvmsg handlers must set msg_namelen to the proper size <= sizeof(struct sockaddr_storage) to return msg_name to the user.
This prevents numerous uninitialized memory leaks we had in the recvmsg handlers and makes it harder for new code to accidentally leak uninitialized memory.
Optimize for the case recvfrom is called with NULL as address. We don't need to copy the address at all, so set it to NULL before invoking the recvmsg handler. We can do so, because all the recvmsg handlers must cope with the case a plain read() is called on them. read() also sets msg_name to NULL.
Also document these changes in include/linux/net.h as suggested by David Miller.
Changes since RFC:
Set msg->msg_name = NULL if user specified a NULL in msg_name but had a non-null msg_namelen in verify_iovec/verify_compat_iovec. This doesn't affect sendto as it would bail out earlier while trying to copy-in the address. It also more naturally reflects the logic by the callers of verify_iovec.
With this change in place I could remove "
if (!uaddr || msg_sys->msg_namelen == 0)
msg->msg_name = NULL
".
This change does not alter the user visible error logic as we ignore msg_namelen as long as msg_name is NULL.
Also remove two unnecessary curly brackets in ___sys_recvmsg and change comments to netdev style.
--- crypto/algif_hash.c | 2 -- crypto/algif_skcipher.c | 1 - drivers/isdn/mISDN/socket.c | 13 ++++--------- drivers/net/ppp/pppoe.c | 2 -- include/linux/net.h | 8 ++++++++ net/appletalk/ddp.c | 16 +++++++--------- net/atm/common.c | 2 -- net/ax25/af_ax25.c | 4 ++-- net/bluetooth/af_bluetooth.c | 4 ---- net/bluetooth/hci_sock.c | 2 -- net/bluetooth/rfcomm/sock.c | 1 - net/caif/caif_socket.c | 4 ---- net/compat.c | 3 ++- net/core/iovec.c | 3 ++- net/ipx/af_ipx.c | 3 +-- net/irda/af_irda.c | 4 ---- net/iucv/af_iucv.c | 2 -- net/key/af_key.c | 1 - net/l2tp/l2tp_ppp.c | 2 -- net/llc/af_llc.c | 2 -- net/netlink/af_netlink.c | 2 -- net/netrom/af_netrom.c | 3 +-- net/nfc/rawsock.c | 2 -- net/packet/af_packet.c | 32 +++++++++++++++----------------- net/rds/recv.c | 2 -- net/rose/af_rose.c | 8 +++++--- net/rxrpc/ar-recvmsg.c | 9 ++++++--- net/socket.c | 19 +++++++++++-------- net/tipc/socket.c | 6 ------ net/unix/af_unix.c | 5 ----- net/x25/af_x25.c | 3 +-- 31 files changed, 65 insertions(+), 105 deletions(-)
crypto/algif_hash.c +0 -2
@@ -161,8 +161,6 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock,else if (len < ds) msg->msg_flags |=MSG_TRUNC ; - msg->msg_namelen =0 ; -lock_sock (sk);if (ctx->more) { ctx->more =0 ;
crypto/algif_skcipher.c +0 -1
@@ -432,7 +432,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,long copied =0 ;lock_sock (sk); - msg->msg_namelen =0 ;for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen >0 ; iovlen--, iov++) {unsigned long seglen = iov->iov_len;
drivers/isdn/mISDN/socket.c +4 -9
@@ -117,7 +117,6 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock, {struct sk_buff *skb;struct sock *sk = sock->sk; -struct sockaddr_mISDN *maddr;int copied, err;
@@ -135,9 +134,9 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,if (!skb)return err; -if (msg->msg_namelen >=sizeof (struct sockaddr_mISDN )) { - msg->msg_namelen =sizeof (struct sockaddr_mISDN ); - maddr = (struct sockaddr_mISDN *)msg->msg_name; +if (msg->msg_name) { +struct sockaddr_mISDN *maddr = msg->msg_name; + maddr->family =AF_ISDN ; maddr->dev =_pms (sk)->dev->id; if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||
@@ -150,11 +149,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock, maddr->sapi =_pms (sk)->ch.addr &0xFF ; maddr->tei = (_pms (sk)->ch.addr >>8 ) &0xFF ; } - }else { -if (msg->msg_namelen) -printk (KERN_WARNING "%s: too small namelen %d\n" , - __func__, msg->msg_namelen); - msg->msg_namelen =0 ; + msg->msg_namelen =sizeof (*maddr); } copied = skb->len +MISDN_HEADER_LEN ;
drivers/net/ppp/pppoe.c +0 -2
@@ -985,8 +985,6 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,if (error <0 ) goto end; - m->msg_namelen =0 ; -if (skb) { total_len =min_t (size_t, total_len, skb->len); error =skb_copy_datagram_iovec (skb,0 , m->msg_iov, total_len);
include/linux/net.h +8 -0
@@ -197,6 +197,14 @@ struct proto_ops {#endif int (*sendmsg) (struct kiocb *iocb,struct socket *sock,struct msghdr *m,size_t total_len); +/* Notes for implementing recvmsg: +* =============================== +* msg->msg_namelen should get updated by the recvmsg handlers +* iff msg_name != NULL. It is by default 0 to prevent +* returning uninitialized memory to user space. The recvfrom +* handlers can assume that msg.msg_name is either NULL or has +* a minimum size of sizeof(struct sockaddr_storage). +*/ int (*recvmsg) (struct kiocb *iocb,struct socket *sock,struct msghdr *m,size_t total_len,int flags);
net/appletalk/ddp.c +7 -9
@@ -1740,7 +1740,6 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr size_t size, int flags) {struct sock *sk = sock->sk; -struct sockaddr_at *sat = (struct sockaddr_at *)msg->msg_name;struct ddpehdr *ddp;int copied =0 ;int offset =0 ;
@@ -1769,14 +1768,13 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr } err =skb_copy_datagram_iovec (skb, offset, msg->msg_iov, copied); -if (!err) { -if (sat) { - sat->sat_family =AF_APPLETALK ; - sat->sat_port = ddp->deh_sport; - sat->sat_addr.s_node = ddp->deh_snode; - sat->sat_addr.s_net = ddp->deh_snet; - } - msg->msg_namelen =sizeof (*sat); +if (!err && msg->msg_name) { +struct sockaddr_at *sat = msg->msg_name; + sat->sat_family =AF_APPLETALK ; + sat->sat_port = ddp->deh_sport; + sat->sat_addr.s_node = ddp->deh_snode; + sat->sat_addr.s_net = ddp->deh_snet; + msg->msg_namelen =sizeof (*sat); }skb_free_datagram (sk, skb);/* Free the datagram. */
net/atm/common.c +0 -2
@@ -500,8 +500,6 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,struct sk_buff *skb;int copied, error = -EINVAL ; - msg->msg_namelen =0 ; -if (sock->state !=SS_CONNECTED )return -ENOTCONN ;if (flags & ~MSG_DONTWAIT )/* only handle MSG_DONTWAIT */
net/ax25/af_ax25.c +2 -2
@@ -1635,11 +1635,11 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,skb_copy_datagram_iovec (skb,0 , msg->msg_iov, copied); -if (msg->msg_namelen !=0 ) { -struct sockaddr_ax25 *sax = (struct sockaddr_ax25 *)msg->msg_name; +if (msg->msg_name) {ax25_digi digi;ax25_address src;const unsigned char *mac =skb_mac_header (skb); +struct sockaddr_ax25 *sax = msg->msg_name;memset (sax,0 ,sizeof (struct full_sockaddr_ax25 )); ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL,
net/bluetooth/af_bluetooth.c +0 -4
@@ -245,8 +245,6 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,if (flags & (MSG_OOB ))return -EOPNOTSUPP ; - msg->msg_namelen =0 ; - skb =skb_recv_datagram (sk, flags, noblock, &err);if (!skb) {if (sk->sk_shutdown &RCV_SHUTDOWN )
@@ -311,8 +309,6 @@ int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,if (flags &MSG_OOB )return -EOPNOTSUPP ; - msg->msg_namelen =0 ; -BT_DBG ("sk %p size %zu" , sk, size);lock_sock (sk);
net/bluetooth/hci_sock.c +0 -2
@@ -448,8 +448,6 @@ static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,if (!skb)return err; - msg->msg_namelen =0 ; - copied = skb->len;if (len < copied) { msg->msg_flags |=MSG_TRUNC ;
net/bluetooth/rfcomm/sock.c +0 -1
@@ -627,7 +627,6 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,if (test_and_clear_bit (RFCOMM_DEFER_SETUP , &d->flags)) {rfcomm_dlc_accept (d); - msg->msg_namelen =0 ;return 0 ; }
net/caif/caif_socket.c +0 -4
@@ -320,8 +320,6 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock,if (m->msg_flags&MSG_OOB ) goto read_error; - m->msg_namelen =0 ; - skb =skb_recv_datagram (sk, flags,0 , &ret);if (!skb) goto read_error;
@@ -395,8 +393,6 @@ static int caif_stream_recvmsg(struct kiocb *iocb, struct socket *sock,if (flags&MSG_OOB ) goto out; - msg->msg_namelen =0 ; -/* * Lock the socket to prevent queue disordering * while sleeps in memcpy_tomsg
net/compat.c +2 -1
@@ -93,7 +93,8 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,if (err <0 )return err; } - kern_msg->msg_name = kern_address; +if (kern_msg->msg_name) + kern_msg->msg_name = kern_address; }else kern_msg->msg_name =NULL ;
net/core/iovec.c +2 -1
@@ -48,7 +48,8 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,if (err <0 )return err; } - m->msg_name = address; +if (m->msg_name) + m->msg_name = address; }else { m->msg_name =NULL ; }
net/ipx/af_ipx.c +1 -2
@@ -1835,8 +1835,6 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,if (skb->tstamp.tv64) sk->sk_stamp = skb->tstamp; - msg->msg_namelen =sizeof (*sipx); -if (sipx) { sipx->sipx_family =AF_IPX ; sipx->sipx_port = ipx->ipx_source.sock;
@@ -1844,6 +1842,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock, sipx->sipx_network =IPX_SKB_CB (skb)->ipx_source_net; sipx->sipx_type = ipx->ipx_type; sipx->sipx_zero =0 ; + msg->msg_namelen =sizeof (*sipx); } rc = copied;
net/irda/af_irda.c +0 -4
@@ -1386,8 +1386,6 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock,IRDA_DEBUG (4 ,"%s()\n" , __func__); - msg->msg_namelen =0 ; - skb =skb_recv_datagram (sk, flags & ~MSG_DONTWAIT , flags &MSG_DONTWAIT , &err);if (!skb)
@@ -1452,8 +1450,6 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock, target =sock_rcvlowat (sk, flags &MSG_WAITALL , size); timeo =sock_rcvtimeo (sk, noblock); - msg->msg_namelen =0 ; - do { int chunk; struct sk_buff *skb = skb_dequeue(&sk->sk_receive_queue);
net/iucv/af_iucv.c +0 -2
@@ -1356,8 +1356,6 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,int blen;int err =0 ; - msg->msg_namelen =0 ; - if ((sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED) && skb_queue_empty(&iucv->backlog_skb_q) && skb_queue_empty(&sk->sk_receive_queue) &&
net/key/af_key.c +0 -1
@@ -3595,7 +3595,6 @@ static int pfkey_recvmsg(struct kiocb *kiocb,if (flags & ~(MSG_PEEK |MSG_DONTWAIT |MSG_TRUNC |MSG_CMSG_COMPAT )) goto out; - msg->msg_namelen =0 ; skb =skb_recv_datagram (sk, flags, flags &MSG_DONTWAIT , &err);if (skb ==NULL ) goto out;
net/l2tp/l2tp_ppp.c +0 -2
@@ -200,8 +200,6 @@ static int pppol2tp_recvmsg(struct kiocb *iocb, struct socket *sock,if (sk->sk_state &PPPOX_BOUND ) goto end; - msg->msg_namelen =0 ; - err =0 ; skb =skb_recv_datagram (sk, flags & ~MSG_DONTWAIT , flags &MSG_DONTWAIT , &err);
net/llc/af_llc.c +0 -2
@@ -720,8 +720,6 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,int target;/* Read at least this many bytes */ long timeo; - msg->msg_namelen =0 ; -lock_sock (sk); copied = -ENOTCONN ;if (unlikely (sk->sk_type ==SOCK_STREAM && sk->sk_state ==TCP_LISTEN ))
net/netlink/af_netlink.c +0 -2
@@ -1445,8 +1445,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock, }#endif - msg->msg_namelen =0 ; - copied = data_skb->len;if (len < copied) { msg->msg_flags |=MSG_TRUNC ;
net/netrom/af_netrom.c +1 -2
@@ -1182,10 +1182,9 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, sax->sax25_family =AF_NETROM ;skb_copy_from_linear_data_offset (skb,7 , sax->sax25_call.ax25_call,AX25_ADDR_LEN ); + msg->msg_namelen =sizeof (*sax); } - msg->msg_namelen =sizeof (*sax); -skb_free_datagram (sk, skb);release_sock (sk);
net/nfc/rawsock.c +0 -2
@@ -248,8 +248,6 @@ static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,if (!skb)return rc; - msg->msg_namelen =0 ; - copied = skb->len;if (len < copied) { msg->msg_flags |=MSG_TRUNC ;
net/packet/af_packet.c +15 -17
@@ -2663,7 +2663,6 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,struct sock *sk = sock->sk;struct sk_buff *skb;int copied, err; -struct sockaddr_ll *sll;int vnet_hdr_len =0 ; err = -EINVAL ;
@@ -2746,22 +2745,10 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock, goto out_free; } -/* -* If the address length field is there to be filled in, we fill -* it in now. -*/ - - sll = &PACKET_SKB_CB (skb)->sa.ll; -if (sock->type ==SOCK_PACKET ) - msg->msg_namelen =sizeof (struct sockaddr_pkt ); -else - msg->msg_namelen = sll->sll_halen + offsetof(struct sockaddr_ll , sll_addr); - -/* -* You lose any data beyond the buffer you gave. If it worries a -* user program they can ask the device for its MTU anyway. +/* You lose any data beyond the buffer you gave. If it worries +* a user program they can ask the device for its MTU +* anyway. */ - copied = skb->len;if (copied > len) { copied = len;
@@ -2774,9 +2761,20 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,sock_recv_ts_and_drops (msg, sk, skb); -if (msg->msg_name) +if (msg->msg_name) { +/* If the address length field is there to be filled +* in, we fill it in now. +*/ +if (sock->type ==SOCK_PACKET ) { + msg->msg_namelen =sizeof (struct sockaddr_pkt ); + }else { +struct sockaddr_ll *sll = &PACKET_SKB_CB (skb)->sa.ll; + msg->msg_namelen = sll->sll_halen + + offsetof(struct sockaddr_ll , sll_addr); + }memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, msg->msg_namelen); + }if (pkt_sk (sk)->auxdata) {struct tpacket_auxdata aux;
net/rds/recv.c +0 -2
@@ -410,8 +410,6 @@ int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,rdsdebug ("size %zu flags 0x%x timeo %ld\n" , size, msg_flags, timeo); - msg->msg_namelen =0 ; -if (msg_flags &MSG_OOB ) goto out;
net/rose/af_rose.c +5 -3
@@ -1221,7 +1221,6 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, {struct sock *sk = sock->sk;struct rose_sock *rose =rose_sk (sk); -struct sockaddr_rose *srose = (struct sockaddr_rose *)msg->msg_name;size_t copied;unsigned char *asmptr;struct sk_buff *skb;
@@ -1257,8 +1256,11 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,skb_copy_datagram_iovec (skb,0 , msg->msg_iov, copied); -if (srose !=NULL ) { -memset (srose,0 , msg->msg_namelen); +if (msg->msg_name) { +struct sockaddr_rose *srose; + +memset (msg->msg_name,0 ,sizeof (struct full_sockaddr_rose )); + srose = msg->msg_name; srose->srose_family =AF_ROSE ; srose->srose_addr = rose->dest_addr; srose->srose_call = rose->dest_call;
net/rxrpc/ar-recvmsg.c +6 -3
@@ -143,10 +143,13 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,/* copy the peer address and timestamp */ if (!continue_call) { -if (msg->msg_name && msg->msg_namelen >0 ) +if (msg->msg_name) { +size_t len = +sizeof (call->conn->trans->peer->srx);memcpy (msg->msg_name, - &call->conn->trans->peer->srx, -sizeof (call->conn->trans->peer->srx)); + &call->conn->trans->peer->srx, len); + msg->msg_namelen = len; + }sock_recv_ts_and_drops (msg, &rx->sk, skb); }
net/socket.c +11 -8
@@ -1752,8 +1752,10 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, msg.msg_iov = &iov; iov.iov_len = size; iov.iov_base = ubuf; - msg.msg_name = (struct sockaddr *)&address; - msg.msg_namelen =sizeof (address); +/* Save some cycles and don't copy the address if not needed */ + msg.msg_name = addr ? (struct sockaddr *)&address :NULL ; +/* We assume all kernel code knows the size of sockaddr_storage */ + msg.msg_namelen =0 ;if (sock->file->f_flags &O_NONBLOCK ) flags |=MSG_DONTWAIT ; err =sock_recvmsg (sock, &msg, size, flags);
@@ -2142,18 +2144,16 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, goto out; } -/* -* Save the user-mode address (verify_iovec will change the -* kernel msghdr to use the kernel address space) +/* Save the user-mode address (verify_iovec will change the +* kernel msghdr to use the kernel address space) */ - uaddr = (__force void __user *)msg_sys->msg_name; uaddr_len =COMPAT_NAMELEN (msg); -if (MSG_CMSG_COMPAT & flags) { +if (MSG_CMSG_COMPAT & flags) err =verify_compat_iovec (msg_sys, iov, (struct sockaddr *)&addr,VERIFY_WRITE ); - }else +else err =verify_iovec (msg_sys, iov, (struct sockaddr *)&addr,VERIFY_WRITE );
@@ -2164,6 +2164,9 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, cmsg_ptr = (unsigned long )msg_sys->msg_control; msg_sys->msg_flags = flags & (MSG_CMSG_CLOEXEC |MSG_CMSG_COMPAT ); +/* We assume all kernel code knows the size of sockaddr_storage */ + msg_sys->msg_namelen =0 ; +if (sock->file->f_flags &O_NONBLOCK ) flags |=MSG_DONTWAIT ; err = (nosec ? sock_recvmsg_nosec : sock_recvmsg)(sock, msg_sys,
net/tipc/socket.c +0 -6
@@ -949,9 +949,6 @@ static int recv_msg(struct kiocb *iocb, struct socket *sock, goto exit; } -/* will be updated in set_orig_addr() if needed */ - m->msg_namelen =0 ; - timeout =sock_rcvtimeo (sk, flags &MSG_DONTWAIT ); restart:
@@ -1078,9 +1075,6 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock, goto exit; } -/* will be updated in set_orig_addr() if needed */ - m->msg_namelen =0 ; - target =sock_rcvlowat (sk, flags &MSG_WAITALL , buf_len); timeout =sock_rcvtimeo (sk, flags &MSG_DONTWAIT ); restart:
net/unix/af_unix.c +0 -5
@@ -1744,7 +1744,6 @@ static void unix_copy_addr(struct msghdr *msg, struct sock *sk) {struct unix_sock *u =unix_sk (sk); - msg->msg_namelen =0 ;if (u->addr) { msg->msg_namelen = u->addr->len;memcpy (msg->msg_name, u->addr->name, u->addr->len);
@@ -1767,8 +1766,6 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,if (flags&MSG_OOB ) goto out; - msg->msg_namelen =0 ; - err =mutex_lock_interruptible (&u->readlock);if (err) { err =sock_intr_errno (sock_rcvtimeo (sk, noblock));
@@ -1902,8 +1899,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, target =sock_rcvlowat (sk, flags&MSG_WAITALL , size); timeo =sock_rcvtimeo (sk, flags&MSG_DONTWAIT ); - msg->msg_namelen =0 ; -/* Lock the socket to prevent queue disordering * while sleeps in memcpy_tomsg */
net/x25/af_x25.c +1 -2
@@ -1343,10 +1343,9 @@ static int x25_recvmsg(struct kiocb *iocb, struct socket *sock,if (sx25) { sx25->sx25_family =AF_X25 ; sx25->sx25_addr = x25->dest_addr; + msg->msg_namelen =sizeof (*sx25); } - msg->msg_namelen =sizeof (struct sockaddr_x25 ); -x25_check_rbuf (sk); rc = copied; out_free_dgram:
PATCH 160/185 net: add BUG_ON if kernel advertises msg_namelen > sizeof(struct sockaddr_storage)
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 68c6beb373955da0886d8f4f5995b3922ceda4be ]
In that case it is probable that kernel code overwrote part of the stack. So we should bail out loudly here.
The BUG_ON may be removed in future if we are sure all protocols are conformant.
--- net/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/socket.c +2 -1
@@ -215,12 +215,13 @@ static int move_addr_to_user(struct sockaddr *kaddr, int klen,int err;int len; +BUG_ON (klen >sizeof (struct sockaddr_storage )); err =get_user (len, ulen);if (err)return err;if (len > klen) len = klen; -if (len <0 || len >sizeof (struct sockaddr_storage )) +if (len <0 )return -EINVAL ;if (len) {if (audit_sockaddr (klen, kaddr))
PATCH 161/185 inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 85fbaa75037d0b6b786ff18658ddf0b4014ce2a4 ]
Commit bceaa90240b6019ed73b49965eac7d167610be69 ("inet: prevent leakage of uninitialized memory to user in recv syscalls") conditionally updated addr_len if the msg_name is written to. The recv_error and rxpmtu functions relied on the recvmsg functions to set up addr_len before.
As this does not happen any more we have to pass addr_len to those functions as well and set it to the size of the corresponding sockaddr length.
This broke traceroute and such.
--- include/net/ip.h | 2 +- include/net/ipv6.h | 6 ++++-- net/ipv4/ip_sockglue.c | 3 ++- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/datagram.c | 7 +++++-- net/ipv6/raw.c | 4 ++-- net/ipv6/udp.c | 4 ++-- 9 files changed, 19 insertions(+), 13 deletions(-)
include/net/ip.h +1 -1
@@ -466,7 +466,7 @@ extern int compat_ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen);extern int ip_ra_control (struct sock *sk,unsigned char on,void (*destructor)(struct sock *)); -extern int ip_recv_error (struct sock *sk,struct msghdr *msg,int len); +extern int ip_recv_error (struct sock *sk,struct msghdr *msg,int len,int *addr_len);extern void ip_icmp_error (struct sock *sk,struct sk_buff *skb,int err,__be16 port,u32 info,u8 *payload); extern void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport,
include/net/ipv6.h +4 -2
@@ -602,8 +602,10 @@ extern int compat_ipv6_getsockopt(struct sock *sk,extern int ip6_datagram_connect (struct sock *sk,struct sockaddr *addr,int addr_len); -extern int ipv6_recv_error (struct sock *sk,struct msghdr *msg,int len); -extern int ipv6_recv_rxpmtu (struct sock *sk,struct msghdr *msg,int len); +extern int ipv6_recv_error (struct sock *sk,struct msghdr *msg,int len, +int *addr_len); +extern int ipv6_recv_rxpmtu (struct sock *sk,struct msghdr *msg,int len, +int *addr_len);extern void ipv6_icmp_error (struct sock *sk,struct sk_buff *skb,int err,__be16 port,u32 info,u8 *payload);extern void ipv6_local_error (struct sock *sk,int err,struct flowi6 *fl6,u32 info);
net/ipv4/ip_sockglue.c +2 -1
@@ -374,7 +374,7 @@ void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 port, u32 inf/* * Handle MSG_ERRQUEUE */ -int ip_recv_error (struct sock *sk,struct msghdr *msg,int len) +int ip_recv_error (struct sock *sk,struct msghdr *msg,int len,int *addr_len) {struct sock_exterr_skb *serr;struct sk_buff *skb, *skb2;
@@ -411,6 +411,7 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len) serr->addr_offset); sin->sin_port = serr->port;memset (&sin->sin_zero,0 ,sizeof (sin->sin_zero)); + *addr_len =sizeof (*sin); }memcpy (&errhdr.ee, &serr->ee,sizeof (struct sock_extended_err ));
net/ipv4/ping.c +1 -1
@@ -632,7 +632,7 @@ static int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, goto out;if (flags &MSG_ERRQUEUE ) -return ip_recv_error (sk, msg, len); +return ip_recv_error (sk, msg, len, addr_len); skb =skb_recv_datagram (sk, flags, noblock, &err);if (!skb)
net/ipv4/raw.c +1 -1
@@ -687,7 +687,7 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, goto out;if (flags &MSG_ERRQUEUE ) { - err =ip_recv_error (sk, msg, len); + err =ip_recv_error (sk, msg, len, addr_len); goto out; }
net/ipv4/udp.c +1 -1
@@ -1172,7 +1172,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,bool slow;if (flags &MSG_ERRQUEUE ) -return ip_recv_error (sk, msg, len); +return ip_recv_error (sk, msg, len, addr_len); try_again: skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),
net/ipv6/datagram.c +5 -2
@@ -315,7 +315,7 @@ void ipv6_local_rxpmtu(struct sock *sk, struct flowi6 *fl6, u32 mtu)/* * Handle MSG_ERRQUEUE */ -int ipv6_recv_error (struct sock *sk,struct msghdr *msg,int len) +int ipv6_recv_error (struct sock *sk,struct msghdr *msg,int len,int *addr_len) {struct ipv6_pinfo *np =inet6_sk (sk);struct sock_exterr_skb *serr;
@@ -366,6 +366,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)ipv6_addr_set_v4mapped (*(__be32 *)(nh + serr->addr_offset), &sin->sin6_addr); } + *addr_len =sizeof (*sin); }memcpy (&errhdr.ee, &serr->ee,sizeof (struct sock_extended_err ));
@@ -418,7 +419,8 @@ out:/* * Handle IPV6_RECVPATHMTU */ -int ipv6_recv_rxpmtu (struct sock *sk,struct msghdr *msg,int len) +int ipv6_recv_rxpmtu (struct sock *sk,struct msghdr *msg,int len, +int *addr_len) {struct ipv6_pinfo *np =inet6_sk (sk);struct sk_buff *skb;
@@ -452,6 +454,7 @@ int ipv6_recv_rxpmtu(struct sock *sk, struct msghdr *msg, int len) sin->sin6_port =0 ; sin->sin6_scope_id = mtu_info.ip6m_addr.sin6_scope_id;ipv6_addr_copy (&sin->sin6_addr, &mtu_info.ip6m_addr.sin6_addr); + *addr_len =sizeof (*sin); }put_cmsg (msg,SOL_IPV6 ,IPV6_PATHMTU ,sizeof (mtu_info), &mtu_info);
net/ipv6/raw.c +2 -2
@@ -457,10 +457,10 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,return -EOPNOTSUPP ;if (flags &MSG_ERRQUEUE ) -return ipv6_recv_error (sk, msg, len); +return ipv6_recv_error (sk, msg, len, addr_len);if (np->rxpmtu && np->rxopt.bits.rxpmtu) -return ipv6_recv_rxpmtu (sk, msg, len); +return ipv6_recv_rxpmtu (sk, msg, len, addr_len); skb =skb_recv_datagram (sk, flags, noblock, &err);if (!skb)
net/ipv6/udp.c +2 -2
@@ -348,10 +348,10 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,bool slow;if (flags &MSG_ERRQUEUE ) -return ipv6_recv_error (sk, msg, len); +return ipv6_recv_error (sk, msg, len, addr_len);if (np->rxpmtu && np->rxopt.bits.rxpmtu) -return ipv6_recv_rxpmtu (sk, msg, len); +return ipv6_recv_rxpmtu (sk, msg, len, addr_len); try_again: skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),
PATCH 162/185 net: clamp ->msg_namelen instead of returning an error
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit db31c55a6fb245fdbb752a2ca4aefec89afabb06 ]
If kmsg->msg_namelen > sizeof(struct sockaddr_storage) then in the original code that would lead to memory corruption in the kernel if you had audit configured. If you didn't have audit configured it was harmless.
There are some programs such as beta versions of Ruby which use too large of a buffer and returning an error code breaks them. We should clamp the ->msg_namelen value instead.
--- net/compat.c | 2 +- net/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/compat.c +1 -1
@@ -72,7 +72,7 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) __get_user(kmsg->msg_flags, &umsg->msg_flags))return -EFAULT ;if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) -return -EINVAL ; + kmsg->msg_namelen =sizeof (struct sockaddr_storage ); kmsg->msg_name =compat_ptr (tmp1); kmsg->msg_iov =compat_ptr (tmp2); kmsg->msg_control =compat_ptr (tmp3);
net/socket.c +1 -1
@@ -1885,7 +1885,7 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,if (copy_from_user (kmsg, umsg,sizeof (struct msghdr )))return -EFAULT ;if (kmsg->msg_namelen >sizeof (struct sockaddr_storage )) -return -EINVAL ; + kmsg->msg_namelen =sizeof (struct sockaddr_storage );return 0 ; }
PATCH 163/185 ipv6: fix leaking uninitialized port number of offender sockaddr
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 1fa4c710b6fe7b0aac9907240291b6fe6aafc3b8 ]
Offenders don't have port numbers, so set it to 0.
--- net/ipv6/datagram.c | 1 + 1 file changed, 1 insertion(+)
net/ipv6/datagram.c +1 -0
@@ -375,6 +375,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)if (serr->ee.ee_origin !=SO_EE_ORIGIN_LOCAL ) { sin->sin6_family =AF_INET6 ; sin->sin6_flowinfo =0 ; + sin->sin6_port =0 ; sin->sin6_scope_id =0 ;if (skb->protocol ==htons (ETH_P_IPV6 )) {ipv6_addr_copy (&sin->sin6_addr, &ipv6_hdr (skb)->saddr);
PATCH 164/185 atm: idt77252: fix dev refcnt leak
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ying Xue <[email protected]>
[ Upstream commit b5de4a22f157ca345cdb3575207bf46402414bc1 ]
init_card() calls dev_get_by_name() to get a network deceive. But it doesn't decrease network device reference count after the device is used.
--- drivers/atm/idt77252.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/idt77252.c +1 -1
@@ -3513,7 +3513,7 @@ init_card(struct atm_dev *dev) tmp =dev_get_by_name (&init_net, tname);/* jhs: was "tmp = dev_get(tname);" */ if (tmp) {memcpy (card->atmdev->esi, tmp->dev_addr,6 ); - +dev_put (tmp);printk ("%s: ESI %pM\n" , card->name, card->atmdev->esi); }/*
PATCH 165/185 net: core: Always propagate flag changes to interfaces
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Yasevich <[email protected]>
[ Upstream commit d2615bf450694c1302d86b9cc8a8958edfe4c3a4 ]
The following commit:
b6c40d68ff6498b7f63ddf97cf0aa818d748dee7
net: only invoke dev->change_rx_flags when device is UPtried to fix a problem with VLAN devices and promiscuouse flag setting. The issue was that VLAN device was setting a flag on an interface that was down, thus resulting in bad promiscuity count.
This commit blocked flag propagation to any device that is currently down.
A later commit:
deede2fabe24e00bd7e246eb81cd5767dc6fcfc7
vlan: Don't propagate flag changes on down interfaces
fixed VLAN code to only propagate flags when the VLAN interface is up, thus fixing the same issue as above, only localized to VLAN.
The problem we have now is that if we have create a complex stack involving multiple software devices like bridges, bonds, and vlans, then it is possible that the flags would not propagate properly to the physical devices. A simple examle of the scenario is the following:
eth0----> bond0 ----> bridge0 ---> vlan50
If bond0 or eth0 happen to be down at the time bond0 is added to the bridge, then eth0 will never have promisc mode set which is currently required for operation as part of the bridge. As a result, packets with vlan50 will be dropped by the interface.
The only 2 devices that implement the special flag handling are VLAN and DSA and they both have required code to prevent incorrect flag propagation. As a result we can remove the generic solution introduced in b6c40d68ff6498b7f63ddf97cf0aa818d748dee7 and leave it to the individual devices to decide whether they will block flag propagation or not.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -4515,7 +4515,7 @@ static void dev_change_rx_flags(struct net_device *dev, int flags) {const struct net_device_ops *ops = dev->netdev_ops; -if ((dev->flags &IFF_UP ) && ops->ndo_change_rx_flags) +if (ops->ndo_change_rx_flags) ops->ndo_change_rx_flags (dev, flags); }
PATCH 166/185 bridge: flush br's address entry in fdb when remove the bridge dev
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ding Tianhong <[email protected]>
[ Upstream commit f873042093c0b418d2351fe142222b625c740149 ]
When the following commands are executed:
brctl addbr br0
ifconfig br0 hw ether <addr>
rmmod bridge
The calltrace will occur:
[ 563.312114] device eth1 left promiscuous mode [ 563.312188] br0: port 1(eth1) entered disabled state [ 563.468190] kmem_cache_destroy bridge_fdb_cache: Slab cache still has objects [ 563.468197] CPU: 6 PID: 6982 Comm: rmmod Tainted: G O 3.12.0-0.7-default+ #9 [ 563.468199] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007 [ 563.468200] 0000000000000880 ffff88010f111e98 ffffffff814d1c92 ffff88010f111eb8 [ 563.468204] ffffffff81148efd ffff88010f111eb8 0000000000000000 ffff88010f111ec8 [ 563.468206] ffffffffa062a270 ffff88010f111ed8 ffffffffa063ac76 ffff88010f111f78 [ 563.468209] Call Trace: [ 563.468218] [<ffffffff814d1c92>] dump_stack+0x6a/0x78 [ 563.468234] [<ffffffff81148efd>] kmem_cache_destroy+0xfd/0x100 [ 563.468242] [<ffffffffa062a270>] br_fdb_fini+0x10/0x20 [bridge] [ 563.468247] [<ffffffffa063ac76>] br_deinit+0x4e/0x50 [bridge] [ 563.468254] [<ffffffff810c7dc9>] SyS_delete_module+0x199/0x2b0 [ 563.468259] [<ffffffff814e0922>] system_call_fastpath+0x16/0x1b [ 570.377958] Bridge firewalling registered
--------------------------- cut here -------------------------------
The reason is that when the bridge dev's address is changed, the br_fdb_change_mac_address() will add new address in fdb, but when the bridge was removed, the address entry in the fdb did not free, the bridge_fdb_cache still has objects when destroy the cache, Fix this by flushing the bridge address entry when removing the bridge.
v2: according to the Toshiaki Makita and Vlad's suggestion, I only
delete the vlan0 entry, it still have a leak here if the vlan id is other number, so I need to call fdb_delete_by_port(br, NULL, 1) to flush all entries whose dst is NULL for the bridge.
--- net/bridge/br_if.c | 2 ++ 1 file changed, 2 insertions(+)
net/bridge/br_if.c +2 -0
@@ -170,6 +170,8 @@ void br_dev_delete(struct net_device *dev, struct list_head *head)del_nbp (p); } +br_fdb_delete_by_port (br,NULL ,1 ); +del_timer_sync (&br->gc_timer);br_sysfs_delbr (br->dev);
PATCH 167/185 packet: fix use after free race in send path when dev is released
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit e40526cb20b5ee53419452e1f03d97092f144418 ]
Salam reported a use after free bug in PF_PACKET that occurs when we're sending out frames on a socket bound device and suddenly the net device is being unregistered. It appears that commit 827d9780 introduced a possible race condition between {t,}packet_snd() and packet_notifier(). In the case of a bound socket, packet_notifier() can drop the last reference to the net_device and {t,}packet_snd() might end up suddenly sending a packet over a freed net_device.
To avoid reverting 827d9780 and thus introducing a performance regression compared to the current state of things, we decided to hold a cached RCU protected pointer to the net device and maintain it on write side via bind spin_lock protected register_prot_hook() and __unregister_prot_hook() calls.
In {t,}packet_snd() path, we access this pointer under rcu_read_lock through packet_cached_dev_get() that holds reference to the device to prevent it from being freed through packet_notifier() while we're in send path. This is okay to do as dev_put()/dev_hold() are per-cpu counters, so this should not be a performance issue. Also, the code simplifies a bit as we don't need need_rls_dev anymore.
--- net/packet/af_packet.c | 60 +++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 23 deletions(-)
net/packet/af_packet.c +37 -23
@@ -295,6 +295,7 @@ struct packet_sock {unsigned int tp_reserve; unsigned int tp_loss:1;unsigned int tp_tstamp; +struct net_device __rcu *cached_dev;struct packet_type prot_hook____cacheline_aligned_in_smp ; };
@@ -350,11 +351,15 @@ static void __fanout_link(struct sock *sk, struct packet_sock *po);static void register_prot_hook (struct sock *sk) {struct packet_sock *po =pkt_sk (sk); +if (!po->running) { -if (po->fanout) +if (po->fanout) {__fanout_link (sk, po); -else + }else {dev_add_pack (&po->prot_hook); +rcu_assign_pointer (po->cached_dev, po->prot_hook.dev); + } +sock_hold (sk); po->running =1 ; }
@@ -372,10 +377,13 @@ static void __unregister_prot_hook(struct sock *sk, bool sync)struct packet_sock *po =pkt_sk (sk); po->running =0 ; -if (po->fanout) +if (po->fanout) {__fanout_unlink (sk, po); -else + }else {__dev_remove_pack (&po->prot_hook); +RCU_INIT_POINTER (po->cached_dev,NULL ); + } +__sock_put (sk);if (sync) {
@@ -2032,12 +2040,24 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,return tp_len; } +static struct net_device *packet_cached_dev_get (struct packet_sock *po) +{ +struct net_device *dev; + +rcu_read_lock (); + dev =rcu_dereference (po->cached_dev); +if (dev) +dev_hold (dev); +rcu_read_unlock (); + +return dev; +} +static int tpacket_snd (struct packet_sock *po,struct msghdr *msg) {struct sk_buff *skb;struct net_device *dev;__be16 proto; -bool need_rls_dev = false;int err, reserve =0 ;void *ph;struct sockaddr_ll *saddr = (struct sockaddr_ll *)msg->msg_name;
@@ -2050,7 +2070,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) err = -EBUSY ;if (saddr ==NULL ) { - dev = po->prot_hook.dev; + dev =packet_cached_dev_get (po); proto = po->num; addr =NULL ; }else {
@@ -2064,19 +2084,17 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) proto = saddr->sll_protocol; addr = saddr->sll_addr; dev =dev_get_by_index (sock_net (&po->sk), saddr->sll_ifindex); - need_rls_dev = true; } err = -ENXIO ;if (unlikely (dev ==NULL )) goto out; - - reserve = dev->hard_header_len; - err = -ENETDOWN ;if (unlikely (!(dev->flags &IFF_UP ))) goto out_put; + reserve = dev->hard_header_len; + size_max = po->tx_ring.frame_size - (po->tp_hdrlen -sizeof (struct sockaddr_ll ));
@@ -2152,8 +2170,7 @@ out_status:__packet_set_status (po, ph, status);kfree_skb (skb); out_put: -if (need_rls_dev) -dev_put (dev); +dev_put (dev); out:mutex_unlock (&po->pg_vec_lock);return err;
@@ -2191,7 +2208,6 @@ static int packet_snd(struct socket *sock,struct sk_buff *skb;struct net_device *dev;__be16 proto; -bool need_rls_dev = false;unsigned char *addr;int err, reserve =0 ;struct virtio_net_hdr vnet_hdr = {0 };
@@ -2205,7 +2221,7 @@ static int packet_snd(struct socket *sock,*/ if (saddr ==NULL ) { - dev = po->prot_hook.dev; + dev =packet_cached_dev_get (po); proto = po->num; addr =NULL ; }else {
@@ -2217,19 +2233,17 @@ static int packet_snd(struct socket *sock, proto = saddr->sll_protocol; addr = saddr->sll_addr; dev =dev_get_by_index (sock_net (sk), saddr->sll_ifindex); - need_rls_dev = true; } err = -ENXIO ; -if (dev ==NULL ) +if (unlikely (dev ==NULL )) goto out_unlock; -if (sock->type ==SOCK_RAW ) - reserve = dev->hard_header_len; - err = -ENETDOWN ; -if (!(dev->flags &IFF_UP )) +if (unlikely (!(dev->flags &IFF_UP ))) goto out_unlock; +if (sock->type ==SOCK_RAW ) + reserve = dev->hard_header_len;if (po->has_vnet_hdr) { vnet_hdr_len =sizeof (vnet_hdr);
@@ -2350,15 +2364,14 @@ static int packet_snd(struct socket *sock,if (err >0 && (err =net_xmit_errno (err)) !=0 ) goto out_unlock; -if (need_rls_dev) -dev_put (dev); +dev_put (dev);return len; out_free:kfree_skb (skb); out_unlock: -if (dev && need_rls_dev) +if (dev)dev_put (dev); out:return err;
@@ -2575,6 +2588,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, po =pkt_sk (sk); sk->sk_family =PF_PACKET ; po->num = proto; +RCU_INIT_POINTER (po->cached_dev,NULL ); sk->sk_destruct = packet_sock_destruct;sk_refcnt_debug_inc (sk);
PATCH 168/185 af_packet: block BH in prb_shutdown_retire_blk_timer()
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Veaceslav Falico <[email protected]>
[ Upstream commit ec6f809ff6f19fafba3212f6aff0dda71dfac8e8 ]
Currently we're using plain spin_lock() in prb_shutdown_retire_blk_timer(), however the timer might fire right in the middle and thus try to re-aquire the same spinlock, leaving us in a endless loop.
To fix that, use the spin_lock_bh() to block it.
--- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/packet/af_packet.c +2 -2
@@ -505,9 +505,9 @@ static void prb_shutdown_retire_blk_timer(struct packet_sock *po, pkc = tx_ring ? &po->tx_ring.prb_bdqc : &po->rx_ring.prb_bdqc; -spin_lock (&rb_queue->lock); +spin_lock_bh (&rb_queue->lock); pkc->delete_blk_timer =1 ; -spin_unlock (&rb_queue->lock); +spin_unlock_bh (&rb_queue->lock);prb_del_retire_blk_timer (pkc); }
PATCH 169/185 inet: fix possible seqlock deadlocks
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76 ]
In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left another places where IP_INC_STATS_BH() were improperly used.
udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from process context, not from softirq context.
This was detected by lockdep seqlock support.
--- net/ipv4/ping.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
net/ipv4/ping.c +1 -1
@@ -567,7 +567,7 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, err =PTR_ERR (rt); rt =NULL ;if (err == -ENETUNREACH ) -IP_INC_STATS_BH (net,IPSTATS_MIB_OUTNOROUTES ); +IP_INC_STATS (net,IPSTATS_MIB_OUTNOROUTES ); goto out; }
net/ipv4/tcp_ipv4.c +1 -1
@@ -182,7 +182,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)if (IS_ERR (rt)) { err =PTR_ERR (rt);if (err == -ENETUNREACH ) -IP_INC_STATS_BH (sock_net (sk),IPSTATS_MIB_OUTNOROUTES ); +IP_INC_STATS (sock_net (sk),IPSTATS_MIB_OUTNOROUTES );return err; }
net/ipv4/udp.c +1 -1
@@ -937,7 +937,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, err =PTR_ERR (rt); rt =NULL ;if (err == -ENETUNREACH ) -IP_INC_STATS_BH (net,IPSTATS_MIB_OUTNOROUTES ); +IP_INC_STATS (net,IPSTATS_MIB_OUTNOROUTES ); goto out; }
PATCH 170/185 ipv6: fix possible seqlock deadlock in ip6_finish_output2
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 7f88c6b23afbd31545c676dea77ba9593a1a14bf ]
IPv6 stats are 64 bits and thus are protected with a seqlock. By not disabling bottom-half we could deadlock here if we don't disable bh and a softirq reentrantly updates the same mib.
--- net/ipv6/ip6_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ip6_output.c +2 -2
@@ -144,8 +144,8 @@ static int ip6_finish_output2(struct sk_buff *skb)return res; }rcu_read_unlock (); -IP6_INC_STATS_BH (dev_net (dst->dev), -ip6_dst_idev (dst),IPSTATS_MIB_OUTNOROUTES ); +IP6_INC_STATS (dev_net (dst->dev), +ip6_dst_idev (dst),IPSTATS_MIB_OUTNOROUTES );kfree_skb (skb);return -EINVAL ; }
PATCH 171/185 {pktgen, xfrm} Update IPv4 header total len and checksum after tranformation
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "fan.du" <[email protected]>
[ Upstream commit 3868204d6b89ea373a273e760609cb08020beb1a ]
commit a553e4a6317b2cfc7659542c10fe43184ffe53da ("[PKTGEN]: IPSEC support") tried to support IPsec ESP transport transformation for pktgen, but acctually this doesn't work at all for two reasons(The orignal transformed packet has bad IPv4 checksum value, as well as wrong auth value, reported by wireshark)
- After transpormation, IPv4 header total length needs update, because encrypted payload's length is NOT same as that of plain text.
- After transformation, IPv4 checksum needs re-caculate because of payload has been changed.
With this patch, armmed pktgen with below cofiguration, Wireshark is able to decrypted ESP packet generated by pktgen without any IPv4 checksum error or auth value error.
pgset "flag IPSEC"
pgset "flows 1"
--- net/core/pktgen.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/core/pktgen.c +7 -0
@@ -2524,6 +2524,8 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,if (x) {int ret;__u8 *eth; +struct iphdr *iph; + nhead = x->props.header_len -skb_headroom (skb);if (nhead >0 ) { ret =pskb_expand_head (skb, nhead,0 ,GFP_ATOMIC );
@@ -2545,6 +2547,11 @@ static int process_ipsec(struct pktgen_dev *pkt_dev, eth = (__u8 *)skb_push (skb,ETH_HLEN );memcpy (eth, pkt_dev->hh,12 ); *(u16 *) ð[12 ] = protocol; + +/* Update IPv4 header len as well as checksum value */ + iph =ip_hdr (skb); + iph->tot_len =htons (skb->len -ETH_HLEN ); +ip_send_check (iph); } }return 1 ;
PATCH 172/185 HID: multitouch: validate indexes details
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
commit 8821f5dc187bdf16cfb32ef5aa8c3035273fa79a upstream.
When working on report indexes, always validate that they are in bounds. Without this, a HID device could report a malicious feature report that could trick the driver into a heap overflow:
[ 634.885003] usb 1-1: New USB device found, idVendor=0596, idProduct=0500 ... [ 676.469629] BUG kmalloc-192 (Tainted: G W ): Redzone overwritten
Note that we need to change the indexes from s8 to s16 as they can be between -1 and 255.
CVE-2013-2897
[bwh: Backported to 3.2: mt_device::{cc,cc_value,inputmode}_index do not
exist and the corresponding indices do not need to be validated. mt_device::maxcontact_report_id does not exist either. So all we need to do is to widen mt_device::inputmode.]
---
drivers/hid/hid-multitouch.c +1 -1
@@ -66,7 +66,7 @@ struct mt_device {unsigned last_field_index;/* last field index of the report */ unsigned last_slot_field;/* the last field of a slot */ int last_mt_collection;/* last known mt-related collection */ -__s8 inputmode;/* InputMode HID feature, -1 if non-existent */ +__s16 inputmode;/* InputMode HID feature, -1 if non-existent */ __u8 num_received;/* how many contacts we received */ __u8 num_expected;/* expected last contact index */ __u8 maxcontacts;
PATCH 173/185 crypto: ansi_cprng - Fix off by one error in non-block size request
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Neil Horman <[email protected]>
commit 714b33d15130cbb5ab426456d4e3de842d6c5b8a upstream.
Stephan Mueller reported to me recently a error in random number generation in the ansi cprng. If several small requests are made that are less than the instances block size, the remainder for loop code doesn't increment rand_data_valid in the last iteration, meaning that the last bytes in the rand_data buffer gets reused on the subsequent smaller-than-a-block request for random data.
The fix is pretty easy, just re-code the for loop to make sure that rand_data_valid gets incremented appropriately
--- crypto/ansi_cprng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
crypto/ansi_cprng.c +2 -2
@@ -230,11 +230,11 @@ remainder:*/ if (byte_count <DEFAULT_BLK_SZ ) { empty_rbuf: -for (; ctx->rand_data_valid <DEFAULT_BLK_SZ ; - ctx->rand_data_valid++) { +while (ctx->rand_data_valid <DEFAULT_BLK_SZ ) { *ptr = ctx->rand_data[ctx->rand_data_valid]; ptr++; byte_count--; + ctx->rand_data_valid++;if (byte_count ==0 ) goto done; }
PATCH 174/185 KVM: perform an invalid memslot step for gpa base change
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Marcelo Tosatti <[email protected]>
commit 12d6e7538e2d418c08f082b1b44ffa5fb7270ed8 upstream.
PPC must flush all translations before the new memory slot is visible.
--- virt/kvm/kvm_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
virt/kvm/kvm_main.c +3 -3
@@ -774,7 +774,7 @@ skip_lpage: new.userspace_addr = mem->userspace_addr;#endif /* not defined CONFIG_S390 */ -if (!npages) { +if (!npages || base_gfn != old.base_gfn) { r = -ENOMEM ; slots =kzalloc (sizeof (struct kvm_memslots ),GFP_KERNEL );if (!slots)
@@ -788,8 +788,8 @@ skip_lpage: old_memslots = kvm->memslots;rcu_assign_pointer (kvm->memslots, slots);synchronize_srcu_expedited (&kvm->srcu); -/* From this point no new shadow pages pointing to a deleted -* memslot will be created. +/* From this point no new shadow pages pointing to a deleted, +* or moved, memslot will be created. * * validation of sp->gfn happens in: * - gfn_to_hva (kvm_read_guest, gfn_to_pfn)
PATCH 175/185 KVM: Fix iommu map/unmap to handle memory slot moves
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit e40f193f5bb022e927a57a4f5d5194e4f12ddb74 upstream.
The iommu integration into memory slots expects memory slots to be added or removed and doesn't handle the move case. We can unmap slots from the iommu after we mark them invalid and map them before installing the final memslot array. Also re-order the kmemdup vs map so we don't leave iommu mappings if we get ENOMEM.
--- virt/kvm/kvm_main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
virt/kvm/kvm_main.c +11 -8
@@ -788,6 +788,8 @@ skip_lpage: old_memslots = kvm->memslots;rcu_assign_pointer (kvm->memslots, slots);synchronize_srcu_expedited (&kvm->srcu); +/* slot was deleted or moved, clear iommu mapping */ +kvm_iommu_unmap_pages (kvm, &old);/* From this point no new shadow pages pointing to a deleted, * or moved, memslot will be created. *
@@ -803,14 +805,6 @@ skip_lpage:if (r) goto out_free; -/* map/unmap the pages in iommu page table */ -if (npages) { - r =kvm_iommu_map_pages (kvm, &new); -if (r) - goto out_free; - }else -kvm_iommu_unmap_pages (kvm, &old); - r = -ENOMEM ; slots =kzalloc (sizeof (struct kvm_memslots ),GFP_KERNEL );if (!slots)
@@ -820,6 +814,13 @@ skip_lpage: slots->nmemslots = mem->slot +1 ; slots->generation++; +/* map new memory slot into the iommu */ +if (npages) { + r =kvm_iommu_map_pages (kvm, &new); +if (r) + goto out_slots; + } +/* actual memory is freed via old in kvm_free_physmem_slot below */ if (!npages) { new.rmap =NULL ;
@@ -847,6 +848,8 @@ skip_lpage:return 0 ; +out_slots: +kfree (slots); out_free:kvm_free_physmem_slot (&new, &old); out:
PATCH 176/185 ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
commit 8404663f81d212918ff85f493649a7991209fa04 upstream.
The {get,put}_user macros don't perform range checking on the provided __user address when !CPU_HAS_DOMAINS.
This patch reworks the out-of-line assembly accessors to check the user address against a specified limit, returning -EFAULT if is is out of range.
[will: changed get_user register allocation to match put_user] [rmk: fixed building on older ARM architectures]
--- arch/arm/include/asm/assembler.h | 8 ++++++++ arch/arm/include/asm/uaccess.h | 40 +++++++++++++++++++++++++++------------- arch/arm/lib/getuser.S | 23 +++++++++++++++-------- arch/arm/lib/putuser.S | 6 ++++++ 4 files changed, 56 insertions(+), 21 deletions(-)
arch/arm/include/asm/assembler.h +8 -0
@@ -307,4 +307,12 @@ .size \name , . - \name .endm + .macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req +#ifndef CONFIG_CPU_USE_DOMAINS + adds \tmp, \addr, #\size - 1 + sbcccs \tmp, \tmp, \limit + bcs \bad +#endif + .endm + #endif /* __ASM_ASSEMBLER_H__ */
arch/arm/include/asm/uaccess.h +27 -13
@@ -101,28 +101,39 @@ extern int __get_user_1(void *);extern int __get_user_2 (void *);extern int __get_user_4 (void *); -#define __get_user_x(__r2,__p,__e,__s,__i...) \ +#define __GUP_CLOBBER_1 "lr", "cc" +#ifdef CONFIG_CPU_USE_DOMAINS +#define __GUP_CLOBBER_2 "ip", "lr", "cc" +#else +#define __GUP_CLOBBER_2 "lr", "cc" +#endif +#define __GUP_CLOBBER_4 "lr", "cc" + +#define __get_user_x (__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \ __asmeq("%0", "r0") __asmeq("%1", "r2") \ + __asmeq("%3", "r1") \ "bl __get_user_" #__s \ : "=&r" (__e), "=r" (__r2) \ - : "0" (__p) \ - : __i, "cc") + : "0" (__p), "r" (__l) \ + : __GUP_CLOBBER_##__s)#define get_user (x,p) \ ({ \ + unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ register unsigned long __r2 asm("r2"); \ + register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \ case 1: \ - __get_user_x(__r2, __p, __e, 1, "lr"); \ - break; \ + __get_user_x(__r2, __p, __e, __l, 1); \ + break; \ case 2: \ - __get_user_x(__r2, __p, __e, 2, "r3", "lr"); \ + __get_user_x(__r2, __p, __e, __l, 2); \ break; \ case 4: \ - __get_user_x(__r2, __p, __e, 4, "lr"); \ + __get_user_x(__r2, __p, __e, __l, 4); \ break; \ default: __e = __get_user_bad(); break; \ } \
@@ -135,31 +146,34 @@ extern int __put_user_2(void *, unsignedextern int __put_user_4 (void *,unsigned int );extern int __put_user_8 (void *,unsigned long long ); -#define __put_user_x (__r2,__p,__e,__s) \ +#define __put_user_x (__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \ __asmeq("%0", "r0") __asmeq("%2", "r2") \ + __asmeq("%3", "r1") \ "bl __put_user_" #__s \ : "=&r" (__e) \ - : "0" (__p), "r" (__r2) \ + : "0" (__p), "r" (__r2), "r" (__l) \ : "ip", "lr", "cc")#define put_user (x,p) \ ({ \ + unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __r2 asm("r2") = (x); \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ + register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \ case 1: \ - __put_user_x(__r2, __p, __e, 1); \ + __put_user_x(__r2, __p, __e, __l, 1); \ break; \ case 2: \ - __put_user_x(__r2, __p, __e, 2); \ + __put_user_x(__r2, __p, __e, __l, 2); \ break; \ case 4: \ - __put_user_x(__r2, __p, __e, 4); \ + __put_user_x(__r2, __p, __e, __l, 4); \ break; \ case 8: \ - __put_user_x(__r2, __p, __e, 8); \ + __put_user_x(__r2, __p, __e, __l, 8); \ break; \ default: __e = __put_user_bad(); break; \ } \
arch/arm/lib/getuser.S +15 -8
@@ -16,8 +16,9 @@ * __get_user_X * * Inputs: r0 contains the address + * r1 contains the address limit, which must be preserved * Outputs: r0 is the error code - * r2, r3 contains the zero-extended value + * r2 contains the zero-extended value * lr corrupted * * No other registers must be altered. (see <asm/uaccess.h>
@@ -27,33 +28,39 @@ * Note also that it is intended that __get_user_bad is not global. */ #include <linux/linkage.h> +#include <asm/assembler.h> #include <asm/errno.h> #include <asm/domain.h> ENTRY(__get_user_1) + check_uaccess r0, 1, r1, r2, __get_user_bad 1: T(ldrb) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__get_user_1) ENTRY(__get_user_2) -#ifdef CONFIG_THUMB2_KERNEL -2: T(ldrb) r2, [r0] -3: T(ldrb) r3, [r0, #1] + check_uaccess r0, 2, r1, r2, __get_user_bad +#ifdef CONFIG_CPU_USE_DOMAINS +rb .req ip +2: ldrbt r2, [r0], #1 +3: ldrbt rb, [r0], #0 #else -2: T(ldrb) r2, [r0], #1 -3: T(ldrb) r3, [r0] +rb .req r0 +2: ldrb r2, [r0] +3: ldrb rb, [r0, #1] #endif #ifndef __ARMEB__ - orr r2, r2, r3, lsl #8 + orr r2, r2, rb, lsl #8 #else - orr r2, r3, r2, lsl #8 + orr r2, rb, r2, lsl #8 #endif mov r0, #0 mov pc, lr ENDPROC(__get_user_2) ENTRY(__get_user_4) + check_uaccess r0, 4, r1, r2, __get_user_bad 4: T(ldr) r2, [r0] mov r0, #0 mov pc, lr
arch/arm/lib/putuser.S +6 -0
@@ -16,6 +16,7 @@ * __put_user_X * * Inputs: r0 contains the address + * r1 contains the address limit, which must be preserved * r2, r3 contains the value * Outputs: r0 is the error code * lr corrupted
@@ -27,16 +28,19 @@ * Note also that it is intended that __put_user_bad is not global. */ #include <linux/linkage.h> +#include <asm/assembler.h> #include <asm/errno.h> #include <asm/domain.h> ENTRY(__put_user_1) + check_uaccess r0, 1, r1, ip, __put_user_bad 1: T(strb) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__put_user_1) ENTRY(__put_user_2) + check_uaccess r0, 2, r1, ip, __put_user_bad mov ip, r2, lsr #8 #ifdef CONFIG_THUMB2_KERNEL #ifndef __ARMEB__
@@ -60,12 +64,14 @@ ENTRY(__put_user_2) ENDPROC(__put_user_2) ENTRY(__put_user_4) + check_uaccess r0, 4, r1, ip, __put_user_bad 4: T(str) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__put_user_4) ENTRY(__put_user_8) + check_uaccess r0, 8, r1, ip, __put_user_bad #ifdef CONFIG_THUMB2_KERNEL 5: T(str) r2, [r0] 6: T(str) r3, [r0, #4]
PATCH 177/185 libertas: potential oops in debugfs
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit a497e47d4aec37aaf8f13509f3ef3d1f6a717d88 upstream.
If we do a zero size allocation then it will oops. Also we can't be sure the user passes us a NUL terminated string so I've added a terminator.
This code can only be triggered by root.
--- drivers/net/wireless/libertas/debugfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/libertas/debugfs.c +5 -1
@@ -919,7 +919,10 @@ static ssize_t lbs_debugfs_write(structchar *p2;struct debug_data *d = f->private_data; - pdata =kmalloc (cnt,GFP_KERNEL ); +if (cnt ==0 ) +return 0 ; + + pdata =kmalloc (cnt +1 ,GFP_KERNEL );if (pdata ==NULL )return 0 ;
@@ -928,6 +931,7 @@ static ssize_t lbs_debugfs_write(structkfree (pdata);return 0 ; } + pdata[cnt] ='\0' ; p0 = pdata;for (i =0 ; i < num_of_items; i++) {
PATCH 178/185 aacraid: prevent invalid pointer dereference
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mahesh Rajashekhara <[email protected]>
commit b4789b8e6be3151a955ade74872822f30e8cd914 upstream.
It appears that driver runs into a problem here if fibsize is too small because we allocate user_srbcmd with fibsize size only but later we access it until user_srbcmd->sg.count to copy it over to srbcmd.
It is not correct to test (fibsize < sizeof(*user_srbcmd)) because this structure already includes one sg element and this is not needed for commands without data. So, we would recommend to add the following (instead of test for fibsize == 0).
--- drivers/scsi/aacraid/commctrl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/aacraid/commctrl.c +2 -1
@@ -508,7 +508,8 @@ static int aac_send_raw_srb(struct aac_d goto cleanup; } -if (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr ))) { +if ((fibsize < (sizeof (struct user_aac_srb ) -sizeof (struct user_sgentry ))) || + (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr )))) { rcode = -EINVAL ; goto cleanup; }
PATCH 179/185 xfs: underflow bug in xfs_attrlist_by_handle()
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 31978b5cc66b8ba8a7e8eef60b12395d41b7b890 upstream.
If we allocate less than sizeof(struct attrlist) then we end up corrupting memory or doing a ZERO_PTR_SIZE dereference.
This can only be triggered with CAP_SYS_ADMIN.
--- fs/xfs/xfs_ioctl.c | 3 ++- fs/xfs/xfs_ioctl32.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
fs/xfs/xfs_ioctl.c +2 -1
@@ -404,7 +404,8 @@ xfs_attrlist_by_handle(return -XFS_ERROR (EPERM );if (copy_from_user (&al_hreq, arg,sizeof (xfs_fsop_attrlist_handlereq_t)))return -XFS_ERROR (EFAULT ); -if (al_hreq.buflen >XATTR_LIST_MAX ) +if (al_hreq.buflen <sizeof (struct attrlist ) || + al_hreq.buflen >XATTR_LIST_MAX )return -XFS_ERROR (EINVAL );/*
fs/xfs/xfs_ioctl32.c +2 -1
@@ -361,7 +361,8 @@ xfs_compat_attrlist_by_handle(if (copy_from_user (&al_hreq, arg,sizeof (compat_xfs_fsop_attrlist_handlereq_t)))return -XFS_ERROR (EFAULT ); -if (al_hreq.buflen >XATTR_LIST_MAX ) +if (al_hreq.buflen <sizeof (struct attrlist ) || + al_hreq.buflen >XATTR_LIST_MAX )return -XFS_ERROR (EINVAL );/*
PATCH 180/185 net: flow_dissector: fail on evil iph->ihl
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
commit 6f092343855a71e03b8d209815d8c45bf3a27fcd upstream.
We don't validate iph->ihl which may lead a dead loop if we meet a IPIP skb whose iph->ihl is zero. Fix this by failing immediately when iph->ihl is evil (less than 5).
This issue were introduced by commit ec5efe7946280d1e84603389a1030ccec0a767ae (rps: support IPIP encapsulation).
--- net/core/flow_dissector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +2 -0
@@ -2609,6 +2609,8 @@ ip: goto done; ip = (const struct iphdr *) (skb->data + nhoff); +if (ip->ihl <5 ) + goto done;if (ip_is_fragment (ip)) ip_proto =0 ;else
PATCH 181/185 ftrace: Fix ftrace hash record update with notrace
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
commit c842e975520f8ab09e293cc92f51a1f396251fd5 upstream.
When disabling the "notrace" records, that means we want to trace them. If the notrace_hash is zero, it means that we want to trace all records. But to disable a zero notrace_hash means nothing.
The check for the notrace_hash count was incorrect with:
if (hash && !hash->count) return
With the correct comment above it that states that we do nothing if the notrace_hash has zero count. But !hash also means that the notrace hash has zero count. I think this was done to protect against dereferencing NULL. But if !hash is true, then we go through the following loop without doing a single thing.
Fix it to:
if (!hash || !hash->count) return;
--- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
@@ -1358,7 +1358,7 @@ static void __ftrace_hash_rec_update(str* If the notrace hash has no items, * then there's nothing to do. */ -if (hash && !hash->count) +if (!hash || !hash->count)return ; }
PATCH 182/185 ftrace: Create ftrace_hash_empty() helper routine
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
commit 06a51d9307380c78bb5c92e68fc80ad2c7d7f890 upstream.
There are two types of hashes in the ftrace_ops; one type is the filter_hash and the other is the notrace_hash. Either one may be null, meaning it has no elements. But when elements are added, the hash is allocated.
Throughout the code, a check needs to be made to see if a hash exists or the hash has elements, but the check if the hash exists is usually missing causing the possible "NULL pointer dereference bug".
Add a helper routine called "ftrace_hash_empty()" that returns true if the hash doesn't exist or its count is zero. As they mean the same thing.
--- kernel/trace/ftrace.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
kernel/trace/ftrace.c +17 -11
@@ -1017,6 +1017,11 @@ static struct ftrace_page *ftrace_pages;static struct dyn_ftrace *ftrace_free_records; +static bool ftrace_hash_empty (struct ftrace_hash *hash) +{ +return !hash || !hash->count; +} +static struct ftrace_func_entry *ftrace_lookup_ip (struct ftrace_hash *hash,unsigned long ip) {
@@ -1025,7 +1030,7 @@ ftrace_lookup_ip(struct ftrace_hash *hasstruct hlist_head *hhd;struct hlist_node *n; -if (!hash->count) +if (ftrace_hash_empty (hash))return NULL ;if (hash->size_bits >0 )
@@ -1169,7 +1174,7 @@ alloc_and_copy_ftrace_hash(int size_bitsreturn NULL ;/* Empty hash? */ -if (!hash || !hash->count) +if (ftrace_hash_empty (hash))return new_hash; size =1 << hash->size_bits;
@@ -1294,9 +1299,9 @@ ftrace_ops_test(struct ftrace_ops *ops, filter_hash =rcu_dereference_raw (ops->filter_hash); notrace_hash =rcu_dereference_raw (ops->notrace_hash); -if ((!filter_hash || !filter_hash->count || +if ((ftrace_hash_empty (filter_hash) ||ftrace_lookup_ip (filter_hash, ip)) && - (!notrace_hash || !notrace_hash->count || + (ftrace_hash_empty (notrace_hash) || !ftrace_lookup_ip (notrace_hash, ip))) ret =1 ;else
@@ -1348,7 +1353,7 @@ static void __ftrace_hash_rec_update(strif (filter_hash) { hash = ops->filter_hash; other_hash = ops->notrace_hash; -if (!hash || !hash->count) +if (ftrace_hash_empty (hash)) all =1 ; }else { inc = !inc;
@@ -1358,7 +1363,7 @@ static void __ftrace_hash_rec_update(str* If the notrace hash has no items, * then there's nothing to do. */ -if (!hash || !hash->count) +if (ftrace_hash_empty (hash))return ; }
@@ -1375,8 +1380,8 @@ static void __ftrace_hash_rec_update(strif (!other_hash || !ftrace_lookup_ip (other_hash, rec->ip)) match =1 ; }else { - in_hash = hash && !!ftrace_lookup_ip (hash, rec->ip); - in_other_hash = other_hash && !!ftrace_lookup_ip (other_hash, rec->ip); + in_hash = !!ftrace_lookup_ip (hash, rec->ip); + in_other_hash = !!ftrace_lookup_ip (other_hash, rec->ip);/* *
@@ -1384,7 +1389,7 @@ static void __ftrace_hash_rec_update(strif (filter_hash && in_hash && !in_other_hash) match =1 ;else if (!filter_hash && in_hash && - (in_other_hash || !other_hash->count)) + (in_other_hash ||ftrace_hash_empty (other_hash))) match =1 ; }if (!match)
@@ -1799,7 +1804,7 @@ static int ops_traces_mod(struct ftrace_struct ftrace_hash *hash; hash = ops->filter_hash; -return !!(!hash || !hash->count); +return ftrace_hash_empty (hash); }static int ftrace_update_code (struct module *mod)
@@ -2112,7 +2117,8 @@ static void *t_start(struct seq_file *m,* off, we can short cut and just print out that all * functions are enabled. */ -if (iter->flags &FTRACE_ITER_FILTER && !ops->filter_hash->count) { +if (iter->flags &FTRACE_ITER_FILTER && +ftrace_hash_empty (ops->filter_hash)) {if (*pos >0 )return t_hash_start (m, pos); iter->flags |=FTRACE_ITER_PRINTALL ;
PATCH 183/185 ftrace: Check module functions being traced on reload
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 8c4f3c3fa9681dc549cd35419b259496082fef8b upstream.
There's been a nasty bug that would show up and not give much info. The bug displayed the following warning:
WARNING: at kernel/trace/ftrace.c:1529 __ftrace_hash_rec_update+0x1e3/0x230() Pid: 20903, comm: bash Tainted: G O 3.6.11+ #38405.trunk Call Trace: [<ffffffff8103e5ff>] warn_slowpath_common+0x7f/0xc0 [<ffffffff8103e65a>] warn_slowpath_null+0x1a/0x20 [<ffffffff810c2ee3>] __ftrace_hash_rec_update+0x1e3/0x230 [<ffffffff810c4f28>] ftrace_hash_move+0x28/0x1d0 [<ffffffff811401cc>] ? kfree+0x2c/0x110 [<ffffffff810c68ee>] ftrace_regex_release+0x8e/0x150 [<ffffffff81149f1e>] __fput+0xae/0x220 [<ffffffff8114a09e>] ____fput+0xe/0x10 [<ffffffff8105fa22>] task_work_run+0x72/0x90 [<ffffffff810028ec>] do_notify_resume+0x6c/0xc0 [<ffffffff8126596e>] ? trace_hardirqs_on_thunk+0x3a/0x3c [<ffffffff815c0f88>] int_signal+0x12/0x17 ---[ end trace 793179526ee09b2c ]---
It was finally narrowed down to unloading a module that was being traced.
It was actually more than that. When functions are being traced, there's a table of all functions that have a ref count of the number of active tracers attached to that function. When a function trace callback is registered to a function, the function's record ref count is incremented. When it is unregistered, the function's record ref count is decremented. If an inconsistency is detected (ref count goes below zero) the above warning is shown and the function tracing is permanently disabled until reboot.
The ftrace callback ops holds a hash of functions that it filters on (and/or filters off). If the hash is empty, the default means to filter all functions (for the filter_hash) or to disable no functions (for the notrace_hash).
When a module is unloaded, it frees the function records that represent the module functions. These records exist on their own pages, that is function records for one module will not exist on the same page as function records for other modules or even the core kernel.
Now when a module unloads, the records that represents its functions are freed. When the module is loaded again, the records are recreated with a default ref count of zero (unless there's a callback that traces all functions, then they will also be traced, and the ref count will be incremented).
The problem is that if an ftrace callback hash includes functions of the module being unloaded, those hash entries will not be removed. If the module is reloaded in the same location, the hash entries still point to the functions of the module but the module's ref counts do not reflect that.
With the help of Steve and Joern, we found a reproducer:
Using uinput module and uinput_release function.
cd /sys/kernel/debug/tracing
modprobe uinput
echo uinput_release > set_ftrace_filter
echo function > current_tracer
rmmod uinput
modprobe uinput
# check /proc/modules to see if loaded in same addr, otherwise try again echo nop > current_tracer
[BOOM]
The above loads the uinput module, which creates a table of functions that can be traced within the module.
We add uinput_release to the filter_hash to trace just that function.
Enable function tracincg, which increments the ref count of the record associated to uinput_release.
Remove uinput, which frees the records including the one that represents uinput_release.
Load the uinput module again (and make sure it's at the same address). This recreates the function records all with a ref count of zero, including uinput_release.
Disable function tracing, which will decrement the ref count for uinput_release which is now zero because of the module removal and reload, and we have a mismatch (below zero ref count).
The solution is to check all currently tracing ftrace callbacks to see if any are tracing any of the module's functions when a module is loaded (it already does that with callbacks that trace all functions). If a callback happens to have a module function being traced, it increments that records ref count and starts tracing that function.
There may be a strange side effect with this, where tracing module functions on unload and then reloading a new module may have that new module's functions being traced. This may be something that confuses the user, but it's not a big deal. Another approach is to disable all callback hashes on module unload, but this leaves some ftrace callbacks that may not be registered, but can still have hashes tracing the module's function where ftrace doesn't know about it. That situation can cause the same bug. This solution solves that case too. Another benefit of this solution, is it is possible to trace a module's function on unload and load.
---
kernel/trace/ftrace.c +61 -9
@@ -1799,12 +1799,57 @@ static cycle_t ftrace_update_time;static unsigned long ftrace_update_cnt;unsigned long ftrace_update_tot_cnt; -static int ops_traces_mod (struct ftrace_ops *ops) +static inline int ops_traces_mod (struct ftrace_ops *ops) { -struct ftrace_hash *hash; +/* +* Filter_hash being empty will default to trace module. +* But notrace hash requires a test of individual module functions. +*/ +return ftrace_hash_empty (ops->filter_hash) && +ftrace_hash_empty (ops->notrace_hash); +} + +/* +* Check if the current ops references the record. +* +* If the ops traces all functions, then it was already accounted for. +* If the ops does not trace the current record function, skip it. +* If the ops ignores the function via notrace filter, skip it. +*/ +static inline bool +ops_references_rec (struct ftrace_ops *ops,struct dyn_ftrace *rec) +{ +/* If ops isn't enabled, ignore it */ +if (!(ops->flags &FTRACE_OPS_FL_ENABLED )) +return 0 ; + +/* If ops traces all mods, we already accounted for it */ +if (ops_traces_mod (ops)) +return 0 ; + +/* The function must be in the filter */ +if (!ftrace_hash_empty (ops->filter_hash) && + !ftrace_lookup_ip (ops->filter_hash, rec->ip)) +return 0 ; + +/* If in notrace hash, we ignore it too */ +if (ftrace_lookup_ip (ops->notrace_hash, rec->ip)) +return 0 ; + +return 1 ; +} + +static int referenced_filters (struct dyn_ftrace *rec) +{ +struct ftrace_ops *ops; +int cnt =0 ; + +for (ops = ftrace_ops_list; ops != &ftrace_list_end; ops = ops->next) { +if (ops_references_rec (ops, rec)) + cnt++; + } - hash = ops->filter_hash; -return ftrace_hash_empty (hash); +return cnt; }static int ftrace_update_code (struct module *mod)
@@ -1812,6 +1857,7 @@ static int ftrace_update_code(struct modstruct dyn_ftrace *p;cycle_t start, stop;unsigned long ref =0 ; +bool test = false;/* * When adding a module, we need to check if tracers are
@@ -1824,9 +1870,12 @@ static int ftrace_update_code(struct modfor (ops = ftrace_ops_list; ops != &ftrace_list_end; ops = ops->next) { -if (ops->flags &FTRACE_OPS_FL_ENABLED && -ops_traces_mod (ops)) - ref++; +if (ops->flags &FTRACE_OPS_FL_ENABLED ) { +if (ops_traces_mod (ops)) + ref++; +else + test = true; + } } }
@@ -1834,6 +1883,7 @@ static int ftrace_update_code(struct mod ftrace_update_cnt =0 ;while (ftrace_new_addrs) { +int cnt = ref;/* If something went wrong, bail without enabling anything */ if (unlikely (ftrace_disabled))
@@ -1841,7 +1891,9 @@ static int ftrace_update_code(struct mod p = ftrace_new_addrs; ftrace_new_addrs = p->newlist; - p->flags = ref; +if (test) + cnt +=referenced_filters (p); + p->flags = cnt;/* * Do the initial record conversion from mcount jump
@@ -1864,7 +1916,7 @@ static int ftrace_update_code(struct mod* conversion puts the module to the correct state, thus * passing the ftrace_make_call check. */ -if (ftrace_start_up && ref) { +if (ftrace_start_up && cnt) {int failed =__ftrace_replace_code (p,1 );if (failed) {ftrace_bug (failed, p->ip);
PATCH 184/185 ftrace: Fix function graph with loading of modules
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 8a56d7761d2d041ae5e8215d20b4167d8aa93f51 upstream.
Commit 8c4f3c3fa9681 "ftrace: Check module functions being traced on reload" fixed module loading and unloading with respect to function tracing, but it missed the function graph tracer. If you perform the following
# cd /sys/kernel/debug/tracing # echo function_graph > current_tracer # modprobe nfsd # echo nop > current_tracer
You'll get the following oops message:
------------[ cut here ]------------ WARNING: CPU: 2 PID: 2910 at /linux.git/kernel/trace/ftrace.c:1640 __ftrace_hash_rec_update.part.35+0x168/0x1b9() Modules linked in: nfsd exportfs nfs_acl lockd ipt_MASQUERADE sunrpc ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables uinput snd_hda_codec_idt CPU: 2 PID: 2910 Comm: bash Not tainted 3.13.0-rc1-test #7 Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./To be filled by O.E.M., BIOS SDBLI944.86P 05/08/2007 0000000000000668 ffff8800787efcf8 ffffffff814fe193 ffff88007d500000 0000000000000000 ffff8800787efd38 ffffffff8103b80a 0000000000000668 ffffffff810b2b9a ffffffff81a48370 0000000000000001 ffff880037aea000 Call Trace: [<ffffffff814fe193>] dump_stack+0x4f/0x7c [<ffffffff8103b80a>] warn_slowpath_common+0x81/0x9b [<ffffffff810b2b9a>] ? __ftrace_hash_rec_update.part.35+0x168/0x1b9 [<ffffffff8103b83e>] warn_slowpath_null+0x1a/0x1c [<ffffffff810b2b9a>] __ftrace_hash_rec_update.part.35+0x168/0x1b9 [<ffffffff81502f89>] ? __mutex_lock_slowpath+0x364/0x364 [<ffffffff810b2cc2>] ftrace_shutdown+0xd7/0x12b [<ffffffff810b47f0>] unregister_ftrace_graph+0x49/0x78 [<ffffffff810c4b30>] graph_trace_reset+0xe/0x10 [<ffffffff810bf393>] tracing_set_tracer+0xa7/0x26a [<ffffffff810bf5e1>] tracing_set_trace_write+0x8b/0xbd [<ffffffff810c501c>] ? ftrace_return_to_handler+0xb2/0xde [<ffffffff811240a8>] ? __sb_end_write+0x5e/0x5e [<ffffffff81122aed>] vfs_write+0xab/0xf6 [<ffffffff8150a185>] ftrace_graph_caller+0x85/0x85 [<ffffffff81122dbd>] SyS_write+0x59/0x82 [<ffffffff8150a185>] ftrace_graph_caller+0x85/0x85 [<ffffffff8150a2d2>] system_call_fastpath+0x16/0x1b ---[ end trace 940358030751eafb ]---
The above mentioned commit didn't go far enough. Well, it covered the function tracer by adding checks in __register_ftrace_function(). The problem is that the function graph tracer circumvents that (for a slight efficiency gain when function graph trace is running with a function tracer. The gain was not worth this).
The problem came with ftrace_startup() which should always be called after __register_ftrace_function(), if you want this bug to be completely fixed.
Anyway, this solution moves __register_ftrace_function() inside of ftrace_startup() and removes the need to call them both.
--- kernel/trace/ftrace.c | 68 +++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-)
kernel/trace/ftrace.c +34 -34
@@ -259,9 +259,6 @@ static int remove_ftrace_ops(struct ftrastatic int __register_ftrace_function (struct ftrace_ops *ops) { -if (ftrace_disabled) -return -ENODEV ; -if (FTRACE_WARN_ON (ops == &global_ops))return -EINVAL ;
@@ -290,9 +287,6 @@ static int __unregister_ftrace_function( {int ret; -if (ftrace_disabled) -return -ENODEV ; -if (WARN_ON (!(ops->flags &FTRACE_OPS_FL_ENABLED )))return -EBUSY ;
@@ -1703,10 +1697,15 @@ static void ftrace_startup_enable(int costatic int ftrace_startup (struct ftrace_ops *ops,int command) {bool hash_enable = true; +int ret;if (unlikely (ftrace_disabled))return -ENODEV ; + ret =__register_ftrace_function (ops); +if (ret) +return ret; + ftrace_start_up++; command |=FTRACE_UPDATE_CALLS ;
@@ -1728,12 +1727,17 @@ static int ftrace_startup(struct ftrace_return 0 ; } -static void ftrace_shutdown (struct ftrace_ops *ops,int command) +static int ftrace_shutdown (struct ftrace_ops *ops,int command) {bool hash_disable = true; +int ret;if (unlikely (ftrace_disabled)) -return ; +return -ENODEV ; + + ret =__unregister_ftrace_function (ops); +if (ret) +return ret; ftrace_start_up--;/*
@@ -1768,9 +1772,10 @@ static void ftrace_shutdown(struct ftrac }if (!command || !ftrace_enabled) -return ; +return 0 ;ftrace_run_update_code (command); +return 0 ; }static void ftrace_startup_sysctl (void )
@@ -2622,16 +2627,13 @@ static void __enable_ftrace_function_proif (i ==FTRACE_FUNC_HASHSIZE )return ; - ret =__register_ftrace_function (&trace_probe_ops); -if (!ret) - ret =ftrace_startup (&trace_probe_ops,0 ); + ret =ftrace_startup (&trace_probe_ops,0 ); ftrace_probe_registered =1 ; }static void __disable_ftrace_function_probe (void ) { -int ret;int i;if (!ftrace_probe_registered)
@@ -2644,9 +2646,7 @@ static void __disable_ftrace_function_pr }/* no more funcs left */ - ret =__unregister_ftrace_function (&trace_probe_ops); -if (!ret) -ftrace_shutdown (&trace_probe_ops,0 ); +ftrace_shutdown (&trace_probe_ops,0 ); ftrace_probe_registered =0 ; }
@@ -3619,12 +3619,15 @@ device_initcall(ftrace_nodyn_init);static inline int ftrace_init_dyn_debugfs (struct dentry *d_tracer) {return 0 ; }static inline void ftrace_startup_enable (int command) { }/* Keep as macros so we do not need to define the commands */ -# define ftrace_startup (ops, command) \ - ({ \ - (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ - 0; \ +# define ftrace_startup (ops, command) \ + ({ \ + int ___ret = __register_ftrace_function(ops); \ + if (!___ret) \ + (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ + ___ret; \ }) -# define ftrace_shutdown (ops, command) do { } while (0) +# define ftrace_shutdown (ops, command) __unregister_ftrace_function(ops) +# define ftrace_startup_sysctl () do { } while (0)# define ftrace_shutdown_sysctl () do { } while (0)
@@ -3964,15 +3967,8 @@ int register_ftrace_function(struct ftramutex_lock (&ftrace_lock); -if (unlikely (ftrace_disabled)) - goto out_unlock; - - ret =__register_ftrace_function (ops); -if (!ret) - ret =ftrace_startup (ops,0 ); + ret =ftrace_startup (ops,0 ); - - out_unlock:mutex_unlock (&ftrace_lock);return ret; }
@@ -3989,9 +3985,7 @@ int unregister_ftrace_function(struct ftint ret;mutex_lock (&ftrace_lock); - ret =__unregister_ftrace_function (ops); -if (!ret) -ftrace_shutdown (ops,0 ); + ret =ftrace_shutdown (ops,0 );mutex_unlock (&ftrace_lock);return ret;
@@ -4185,6 +4179,12 @@ ftrace_suspend_notifier_call(struct notireturn NOTIFY_DONE ; } +/* Just a place holder for function graph */ +static struct ftrace_ops fgraph_ops__read_mostly = { + .func = ftrace_stub, + .flags =FTRACE_OPS_FL_GLOBAL , +}; +int register_ftrace_graph (trace_func_graph_ret_t retfunc,trace_func_graph_ent_t entryfunc) {
@@ -4211,7 +4211,7 @@ int register_ftrace_graph(trace_func_gra ftrace_graph_return = retfunc; ftrace_graph_entry = entryfunc; - ret =ftrace_startup (&global_ops,FTRACE_START_FUNC_RET ); + ret =ftrace_startup (&fgraph_ops,FTRACE_START_FUNC_RET ); out:mutex_unlock (&ftrace_lock);
@@ -4228,7 +4228,7 @@ void unregister_ftrace_graph(void) ftrace_graph_active--; ftrace_graph_return = (trace_func_graph_ret_t )ftrace_stub; ftrace_graph_entry = ftrace_graph_entry_stub; -ftrace_shutdown (&global_ops,FTRACE_STOP_FUNC_RET ); +ftrace_shutdown (&fgraph_ops,FTRACE_STOP_FUNC_RET );unregister_pm_notifier (&ftrace_suspend_notifier);unregister_trace_sched_switch (ftrace_graph_probe_sched_switch,NULL );
PATCH 185/185 mmc: block: fix a bug of error handling in MMC driver
In reply to Ben Hutchings3.2.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: KOBAYASHI Yoshitake <[email protected]>
commit c8760069627ad3b0dbbea170f0c4c58b16e18d3d upstream.
Current MMC driver doesn't handle generic error (bit19 of device status) in write sequence. As a result, write data gets lost when generic error occurs. For example, a generic error when updating a filesystem management information causes a loss of write data and corrupts the filesystem. In the worst case, the system will never boot.
This patch includes the following functionality:
1. To enable error checking for the response of CMD12 and CMD13 in write command sequence
2. To retry write sequence when a generic error occurs
Messages are added for v2 to show what occurs.
[Backported to 3.4-stable]
--- drivers/mmc/card/block.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-)
drivers/mmc/card/block.c +44 -3
@@ -634,7 +634,7 @@ static int mmc_blk_cmd_error(struct requ* Otherwise we don't understand what happened, so abort. */ static int mmc_blk_cmd_recovery (struct mmc_card *card,struct request *req, -struct mmc_blk_request *brq,int *ecc_err) +struct mmc_blk_request *brq,int *ecc_err,int *gen_err) {bool prev_cmd_status_valid = true;u32 status, stop_status =0 ;
@@ -665,6 +665,16 @@ static int mmc_blk_cmd_recovery(struct m (brq->cmd.resp[0] & R1_CARD_ECC_FAILED)) *ecc_err =1 ; +/* Flag General errors */ +if (!mmc_host_is_spi (card->host) &&rq_data_dir (req) !=READ ) +if ((status &R1_ERROR ) || + (brq->stop.resp[0 ] &R1_ERROR )) { +pr_err ("%s: %s: general error sending stop or status command, stop cmd response %#x, card status %#x\n" , + req->rq_disk->disk_name, __func__, + brq->stop.resp[0 ], status); + *gen_err =1 ; + } +/* * Check the current card state. If it is in some data transfer * mode, tell it to stop (and hopefully transition back to TRAN.)
@@ -684,6 +694,13 @@ static int mmc_blk_cmd_recovery(struct mreturn ERR_ABORT ;if (stop_status &R1_CARD_ECC_FAILED ) *ecc_err =1 ; +if (!mmc_host_is_spi (card->host) &&rq_data_dir (req) !=READ ) +if (stop_status &R1_ERROR ) { +pr_err ("%s: %s: general error sending stop command, stop cmd response %#x\n" , + req->rq_disk->disk_name, __func__, + stop_status); + *gen_err =1 ; + } }/* Check for set block count errors */
@@ -933,7 +950,7 @@ static int mmc_blk_err_check(struct mmc_ mmc_active);struct mmc_blk_request *brq = &mq_mrq->brq;struct request *req = mq_mrq->req; -int ecc_err =0 ; +int ecc_err =0 , gen_err =0 ;/* * sbc.error indicates a problem with the set block count
@@ -947,7 +964,7 @@ static int mmc_blk_err_check(struct mmc_*/ if (brq->sbc.error || brq->cmd.error || brq->stop.error || brq->data.error) { -switch (mmc_blk_cmd_recovery (card, req, brq, &ecc_err)) { +switch (mmc_blk_cmd_recovery (card, req, brq, &ecc_err, &gen_err)) {case ERR_RETRY :return MMC_BLK_RETRY ;case ERR_ABORT :
@@ -975,6 +992,15 @@ static int mmc_blk_err_check(struct mmc_*/ if (!mmc_host_is_spi (card->host) &&rq_data_dir (req) !=READ ) {u32 status; + +/* Check stop command response */ +if (brq->stop.resp[0 ] &R1_ERROR ) { +pr_err ("%s: %s: general error sending stop command, stop cmd response %#x\n" , + req->rq_disk->disk_name, __func__, + brq->stop.resp[0 ]); + gen_err =1 ; + } + do { int err = get_card_status(card, &status, 5); if (err) {
@@ -982,6 +1008,14 @@ static int mmc_blk_err_check(struct mmc_ req->rq_disk->disk_name, err);return MMC_BLK_CMD_ERR ; } + +if (status &R1_ERROR ) { +pr_err ("%s: %s: general error sending status command, card status %#x\n" , + req->rq_disk->disk_name, __func__, + status); + gen_err =1 ; + } +/* * Some cards mishandle the status bits, * so make sure to check both the busy
@@ -991,6 +1025,13 @@ static int mmc_blk_err_check(struct mmc_ (R1_CURRENT_STATE(status) == R1_STATE_PRG)); } +/* if general error occurs, retry the write operation. */ +if (gen_err) { +pr_warning ("%s: retrying write for general error\n" , + req->rq_disk->disk_name); +return MMC_BLK_RETRY ; + } +if (brq->data.error) { pr_err("%s: error %d transferring data, sector %u, nr %u, cmd response %#x, card status %#x\n", req->rq_disk->disk_name, brq->data.error,
This is the combined patch for 3.2.54-rc1 relative to 3.2.53.
Ben.
Signature · 3 lines
Ben Hutchings
Klipstein's 4th Law of Prototyping and Production:
A fail-safe circuit will destroy others.Documentation/sysctl/kernel.txt +18 -7
@@ -283,13 +283,24 @@ Default value is "/sbin/hotplug". kptr_restrict: This toggle indicates whether restrictions are placed on -exposing kernel addresses via /proc and other interfaces. When -kptr_restrict is set to (0), there are no restrictions. When -kptr_restrict is set to (1), the default, kernel pointers -printed using the %pK format specifier will be replaced with 0's -unless the user has CAP_SYSLOG. When kptr_restrict is set to -(2), kernel pointers printed using %pK will be replaced with 0's -regardless of privileges. +exposing kernel addresses via /proc and other interfaces. + +When kptr_restrict is set to (0), the default, there are no restrictions. + +When kptr_restrict is set to (1), kernel pointers printed using the %pK +format specifier will be replaced with 0's unless the user has CAP_SYSLOG +and effective user and group ids are equal to the real ids. This is +because %pK checks are done at read() time rather than open() time, so +if permissions are elevated between the open() and the read() (e.g via +a setuid binary) then %pK will not leak kernel pointers to unprivileged +users. Note, this is a temporary solution only. The correct long-term +solution is to do the permission checks at open() time. Consider removing +world read permissions from files that use %pK, and using dmesg_restrict +to protect against uses of %pK in dmesg(8) if leaking kernel pointer +values to unprivileged users is a concern. + +When kptr_restrict is set to (2), kernel pointers printed using +%pK will be replaced with 0's regardless of privileges. ==============================================================
Makefile +2 -2
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 53 -EXTRAVERSION = +SUBLEVEL = 54 +EXTRAVERSION = -rc1 NAME = Saber-toothed Squirrel # *DOCUMENTATION*
arch/arm/include/asm/assembler.h +8 -0
@@ -307,4 +307,12 @@ .size \name , . - \name .endm + .macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req +#ifndef CONFIG_CPU_USE_DOMAINS + adds \tmp, \addr, #\size - 1 + sbcccs \tmp, \tmp, \limit + bcs \bad +#endif + .endm + #endif /* __ASM_ASSEMBLER_H__ */
arch/arm/include/asm/uaccess.h +27 -13
@@ -101,28 +101,39 @@ extern int __get_user_1(void *);extern int __get_user_2 (void *);extern int __get_user_4 (void *); -#define __get_user_x(__r2,__p,__e,__s,__i...) \ +#define __GUP_CLOBBER_1 "lr", "cc" +#ifdef CONFIG_CPU_USE_DOMAINS +#define __GUP_CLOBBER_2 "ip", "lr", "cc" +#else +#define __GUP_CLOBBER_2 "lr", "cc" +#endif +#define __GUP_CLOBBER_4 "lr", "cc" + +#define __get_user_x (__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \ __asmeq("%0", "r0") __asmeq("%1", "r2") \ + __asmeq("%3", "r1") \ "bl __get_user_" #__s \ : "=&r" (__e), "=r" (__r2) \ - : "0" (__p) \ - : __i, "cc") + : "0" (__p), "r" (__l) \ + : __GUP_CLOBBER_##__s)#define get_user (x,p) \ ({ \ + unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ register unsigned long __r2 asm("r2"); \ + register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \ case 1: \ - __get_user_x(__r2, __p, __e, 1, "lr"); \ - break; \ + __get_user_x(__r2, __p, __e, __l, 1); \ + break; \ case 2: \ - __get_user_x(__r2, __p, __e, 2, "r3", "lr"); \ + __get_user_x(__r2, __p, __e, __l, 2); \ break; \ case 4: \ - __get_user_x(__r2, __p, __e, 4, "lr"); \ + __get_user_x(__r2, __p, __e, __l, 4); \ break; \ default: __e = __get_user_bad(); break; \ } \
@@ -135,31 +146,34 @@ extern int __put_user_2(void *, unsigned int);extern int __put_user_4 (void *,unsigned int );extern int __put_user_8 (void *,unsigned long long ); -#define __put_user_x (__r2,__p,__e,__s) \ +#define __put_user_x (__r2,__p,__e,__l,__s) \ __asm__ __volatile__ ( \ __asmeq("%0", "r0") __asmeq("%2", "r2") \ + __asmeq("%3", "r1") \ "bl __put_user_" #__s \ : "=&r" (__e) \ - : "0" (__p), "r" (__r2) \ + : "0" (__p), "r" (__r2), "r" (__l) \ : "ip", "lr", "cc")#define put_user (x,p) \ ({ \ + unsigned long __limit = current_thread_info()->addr_limit - 1; \ register const typeof(*(p)) __r2 asm("r2") = (x); \ register const typeof(*(p)) __user *__p asm("r0") = (p);\ + register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \ case 1: \ - __put_user_x(__r2, __p, __e, 1); \ + __put_user_x(__r2, __p, __e, __l, 1); \ break; \ case 2: \ - __put_user_x(__r2, __p, __e, 2); \ + __put_user_x(__r2, __p, __e, __l, 2); \ break; \ case 4: \ - __put_user_x(__r2, __p, __e, 4); \ + __put_user_x(__r2, __p, __e, __l, 4); \ break; \ case 8: \ - __put_user_x(__r2, __p, __e, 8); \ + __put_user_x(__r2, __p, __e, __l, 8); \ break; \ default: __e = __put_user_bad(); break; \ } \
arch/arm/kernel/process.c +5 -2
@@ -468,6 +468,7 @@ EXPORT_SYMBOL(kernel_thread);unsigned long get_wchan (struct task_struct *p) {struct stackframe frame; +unsigned long stack_page;int count =0 ;if (!p || p == current || p->state ==TASK_RUNNING )return 0 ;
@@ -476,9 +477,11 @@ unsigned long get_wchan(struct task_struct *p) frame.sp =thread_saved_sp (p); frame.lr =0 ;/* recovered from the stack */ frame.pc =thread_saved_pc (p); + stack_page = (unsigned long )task_stack_page (p); do { - int ret = unwind_frame(&frame); - if (ret < 0) + if (frame.sp < stack_page || + frame.sp >= stack_page + THREAD_SIZE || + unwind_frame(&frame) < 0) return 0; if (!in_sched_functions(frame.pc)) return frame.pc;
arch/arm/kernel/stacktrace.c +1 -1
@@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackframe *frame) high =ALIGN (low,THREAD_SIZE );/* check current frame pointer is within bounds */ -if (fp < (low +12 ) || fp +4 >= high) +if (fp < low +12 || fp > high -4 )return -EINVAL ;/* restore the registers from the stack frame */
arch/arm/lib/getuser.S +15 -8
@@ -16,8 +16,9 @@ * __get_user_X * * Inputs: r0 contains the address + * r1 contains the address limit, which must be preserved * Outputs: r0 is the error code - * r2, r3 contains the zero-extended value + * r2 contains the zero-extended value * lr corrupted * * No other registers must be altered. (see <asm/uaccess.h>
@@ -27,33 +28,39 @@ * Note also that it is intended that __get_user_bad is not global. */ #include <linux/linkage.h> +#include <asm/assembler.h> #include <asm/errno.h> #include <asm/domain.h> ENTRY(__get_user_1) + check_uaccess r0, 1, r1, r2, __get_user_bad 1: T(ldrb) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__get_user_1) ENTRY(__get_user_2) -#ifdef CONFIG_THUMB2_KERNEL -2: T(ldrb) r2, [r0] -3: T(ldrb) r3, [r0, #1] + check_uaccess r0, 2, r1, r2, __get_user_bad +#ifdef CONFIG_CPU_USE_DOMAINS +rb .req ip +2: ldrbt r2, [r0], #1 +3: ldrbt rb, [r0], #0 #else -2: T(ldrb) r2, [r0], #1 -3: T(ldrb) r3, [r0] +rb .req r0 +2: ldrb r2, [r0] +3: ldrb rb, [r0, #1] #endif #ifndef __ARMEB__ - orr r2, r2, r3, lsl #8 + orr r2, r2, rb, lsl #8 #else - orr r2, r3, r2, lsl #8 + orr r2, rb, r2, lsl #8 #endif mov r0, #0 mov pc, lr ENDPROC(__get_user_2) ENTRY(__get_user_4) + check_uaccess r0, 4, r1, r2, __get_user_bad 4: T(ldr) r2, [r0] mov r0, #0 mov pc, lr
arch/arm/lib/putuser.S +6 -0
@@ -16,6 +16,7 @@ * __put_user_X * * Inputs: r0 contains the address + * r1 contains the address limit, which must be preserved * r2, r3 contains the value * Outputs: r0 is the error code * lr corrupted
@@ -27,16 +28,19 @@ * Note also that it is intended that __put_user_bad is not global. */ #include <linux/linkage.h> +#include <asm/assembler.h> #include <asm/errno.h> #include <asm/domain.h> ENTRY(__put_user_1) + check_uaccess r0, 1, r1, ip, __put_user_bad 1: T(strb) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__put_user_1) ENTRY(__put_user_2) + check_uaccess r0, 2, r1, ip, __put_user_bad mov ip, r2, lsr #8 #ifdef CONFIG_THUMB2_KERNEL #ifndef __ARMEB__
@@ -60,12 +64,14 @@ ENTRY(__put_user_2) ENDPROC(__put_user_2) ENTRY(__put_user_4) + check_uaccess r0, 4, r1, ip, __put_user_bad 4: T(str) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__put_user_4) ENTRY(__put_user_8) + check_uaccess r0, 8, r1, ip, __put_user_bad #ifdef CONFIG_THUMB2_KERNEL 5: T(str) r2, [r0] 6: T(str) r3, [r0, #4]
arch/arm/mach-footbridge/common.c +3 -0
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/io.h> #include <linux/spinlock.h> +#include <video/vga.h> #include <asm/pgtable.h> #include <asm/page.h>
@@ -197,6 +198,8 @@ void __init footbridge_map_io(void)*/ if (footbridge_cfn_mode ())iotable_init (ebsa285_host_io_desc,ARRAY_SIZE (ebsa285_host_io_desc)); + + vga_base =PCIMEM_BASE ; }#ifdef CONFIG_FOOTBRIDGE_ADDIN
arch/arm/mach-footbridge/dc21285.c +0 -2
@@ -18,7 +18,6 @@#include <linux/irq.h> #include <linux/io.h> #include <linux/spinlock.h> -#include <video/vga.h> #include <asm/irq.h> #include <asm/system.h>
@@ -297,7 +296,6 @@ void __init dc21285_preinit(void)int cfn_mode; pcibios_min_mem =0x81000000 ; - vga_base =PCIMEM_BASE ; mem_size = (unsigned int )high_memory -PAGE_OFFSET ;for (mem_mask =0x00100000 ; mem_mask <0x10000000 ; mem_mask <<=1 )
arch/arm/mach-integrator/integrator_cp.c +2 -1
@@ -384,7 +384,8 @@ static struct amba_device aaci_device = {static void cp_clcd_enable (struct clcd_fb *fb) {struct fb_var_screeninfo *var = &fb->fb.var; -u32 val =CM_CTRL_STATIC1 |CM_CTRL_STATIC2 ; +u32 val =CM_CTRL_STATIC1 |CM_CTRL_STATIC2 + |CM_CTRL_LCDEN0 |CM_CTRL_LCDEN1 ;if (var->bits_per_pixel <=8 || (var->bits_per_pixel ==16 && var->green.length ==5 ))
arch/arm/mach-pxa/reset.c +7 -1
@@ -12,6 +12,7 @@#include <mach/regs-ost.h> #include <mach/reset.h> +#include <mach/smemc.h> unsigned int reset_status;EXPORT_SYMBOL (reset_status);
@@ -79,6 +80,12 @@ static void do_hw_reset(void)OWER =OWER_WME ;OSSR =OSSR_M3 ;OSMR3 =OSCR +368640 ;/* ... in 100 ms */ +/* +* SDRAM hangs on watchdog reset on Marvell PXA270 (erratum 71) +* we put SDRAM into self-refresh to prevent that +*/ +while (1 ) +writel_relaxed (MDREFR_SLFRSH ,MDREFR ); }void arch_reset (char mode,const char *cmd)
@@ -99,4 +106,3 @@ void arch_reset(char mode, const char *cmd)break ; } } -
arch/arm/mach-pxa/tosa.c +51 -51
108 lines not on this page · raw message
arch/arm/mach-sa1100/assabet.c +3 -0
@@ -411,6 +411,9 @@ static void __init assabet_map_io(void)* Its called GPCLKR0 in my SA1110 manual. */ Ser1SDCR0 |=SDCR0_SUS ; +MSC1 = (MSC1 & ~0xffff ) | + MSC_NonBrst | MSC_32BitStMem | +MSC_RdAcc (2 ) |MSC_WrAcc (2 ) |MSC_Rec (0 );if (machine_has_neponset ()) {#ifdef CONFIG_ASSABET_NEPONSET
arch/avr32/boot/u-boot/head.S +29 -6
@@ -8,6 +8,8 @@ * published by the Free Software Foundation. */ #include <asm/setup.h> +#include <asm/thread_info.h> +#include <asm/sysreg.h> /* * The kernel is loaded where we want it to be and all caches
@@ -20,11 +22,6 @@ .section .init.text,"ax" .global _start _start: - /* Check if the boot loader actually provided a tag table */ - lddpc r0, magic_number - cp.w r12, r0 - brne no_tag_table - /* Initialize .bss */ lddpc r2, bss_start_addr lddpc r3, end_addr
@@ -34,6 +31,25 @@ _start: cp r2, r3 brlo 1b + /* Initialize status register */ + lddpc r0, init_sr + mtsr SYSREG_SR, r0 + + /* Set initial stack pointer */ + lddpc sp, stack_addr + sub sp, -THREAD_SIZE + +#ifdef CONFIG_FRAME_POINTER + /* Mark last stack frame */ + mov lr, 0 + mov r7, 0 +#endif + + /* Check if the boot loader actually provided a tag table */ + lddpc r0, magic_number + cp.w r12, r0 + brne no_tag_table + /* * Save the tag table address for later use. This must be done * _after_ .bss has been initialized...
@@ -53,8 +69,15 @@ bss_start_addr: .long __bss_start end_addr: .long _end +init_sr: + .long 0x007f0000 /* Supervisor mode, everything masked */ +stack_addr: + .long init_thread_union +panic_addr: + .long panic no_tag_table: sub r12, pc, (. - 2f) - bral panic + /* branch to panic() which can be far away with that construct */ + lddpc pc, panic_addr 2: .asciz "Boot loader didn't provide correct magic number\n"
arch/avr32/kernel/entry-avr32b.S +2 -1
@@ -399,9 +399,10 @@ handle_critical: /* We should never get here... */ bad_return: sub r12, pc, (. - 1f) - bral panic + lddpc pc, 2f .align 2 1: .asciz "Return from critical exception!" +2: .long panic .align 1 do_bus_error_write:
arch/avr32/kernel/head.S +0 -20
@@ -10,33 +10,13 @@ #include <linux/linkage.h> #include <asm/page.h> -#include <asm/thread_info.h> -#include <asm/sysreg.h> .section .init.text,"ax" .global kernel_entry kernel_entry: - /* Initialize status register */ - lddpc r0, init_sr - mtsr SYSREG_SR, r0 - - /* Set initial stack pointer */ - lddpc sp, stack_addr - sub sp, -THREAD_SIZE - -#ifdef CONFIG_FRAME_POINTER - /* Mark last stack frame */ - mov lr, 0 - mov r7, 0 -#endif - /* Start the show */ lddpc pc, kernel_start_addr .align 2 -init_sr: - .long 0x007f0000 /* Supervisor mode, everything masked */ -stack_addr: - .long init_thread_union kernel_start_addr: .long start_kernel
arch/cris/include/asm/io.h +1 -0
@@ -3,6 +3,7 @@#include <asm/page.h> /* for __va, __pa */ #include <arch/io.h> +#include <asm-generic/iomap.h> #include <linux/kernel.h> struct cris_io_operations
arch/ia64/include/asm/processor.h +1 -1
@@ -320,7 +320,7 @@ struct thread_struct { regs->loadrs =0 ; \ regs->r8 =get_dumpable (current->mm);/* set "don't zap registers" flag */ \ regs->r12 = new_sp -16 ;/* allocate 16 byte scratch area */ \ -if (unlikely (!get_dumpable (current->mm))) { \ +if (unlikely (get_dumpable (current->mm) !=SUID_DUMP_USER )) { \/* \ * Zap scratch regs to avoid leaking bits between processes with different \ * uid/privileges. \
arch/powerpc/kernel/signal_32.c +6 -0
@@ -445,6 +445,12 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,#endif /* CONFIG_ALTIVEC */ if (copy_fpr_to_user (&frame->mc_fregs, current))return 1 ; + +/* +* Clear the MSR VSX bit to indicate there is no valid state attached +* to this context, except in the specific case below where we set it. +*/ + msr &= ~MSR_VSX ;#ifdef CONFIG_VSX /* * Copy VSR 0-31 upper half from thread_struct to local
arch/powerpc/kernel/signal_64.c +6 -0
@@ -116,6 +116,12 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,flush_fp_to_thread (current);/* copy fpr regs and fpscr */ err |=copy_fpr_to_user (&sc->fp_regs, current); + +/* +* Clear the MSR VSX bit to indicate there is no valid state attached +* to this context, except in the specific case below where we set it. +*/ + msr &= ~MSR_VSX ;#ifdef CONFIG_VSX /* * Copy VSX low doubleword to local buffer for formatting,
arch/powerpc/kernel/time.c +2 -2
@@ -235,8 +235,6 @@ static u64 scan_dispatch_log(u64 stop_tb)if (i == vpa->dtl_idx)return 0 ;while (i < vpa->dtl_idx) { -if (dtl_consumer) -dtl_consumer (dtl, i); dtb = dtl->timebase; tb_delta = dtl->enqueue_to_dispatch_time + dtl->ready_to_enqueue_time;
@@ -249,6 +247,8 @@ static u64 scan_dispatch_log(u64 stop_tb) }if (dtb > stop_tb)break ; +if (dtl_consumer) +dtl_consumer (dtl, i); stolen += tb_delta; ++i; ++dtl;
arch/powerpc/kernel/vio.c +8 -4
@@ -1351,11 +1351,15 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,const char *cp; dn = dev->of_node; -if (!dn) -return -ENODEV ; +if (!dn) { +strcpy (buf,"\n" ); +return strlen (buf); + } cp =of_get_property (dn,"compatible" ,NULL ); -if (!cp) -return -ENODEV ; +if (!cp) { +strcpy (buf,"\n" ); +return strlen (buf); + }return sprintf (buf,"vio:T%sS%s\n" , vio_dev->type, cp); }
arch/s390/crypto/aes_s390.c +29 -21
129 lines not on this page · raw message
arch/um/os-Linux/start_up.c +2 -0
@@ -15,6 +15,8 @@#include <sys/mman.h> #include <sys/stat.h> #include <sys/wait.h> +#include <sys/time.h> +#include <sys/resource.h> #include <asm/unistd.h> #include "init.h" #include "os.h"
arch/x86/boot/Makefile +3 -3
@@ -51,18 +51,18 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE # How to compile the 16-bit code. Note we always compile for -march=i386, # that way we can complain to the user if the CPU is insufficient. -KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ +KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \ -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes \ -march=i386 -mregparm=3 \ -include $(srctree)/$(src)/code16gcc.h \ -fno-strict-aliasing -fomit-frame-pointer \ + -mno-mmx -mno-sse \ $(call cc-option, -ffreestanding) \ $(call cc-option, -fno-toplevel-reorder,\ - $(call cc-option, -fno-unit-at-a-time)) \ + $(call cc-option, -fno-unit-at-a-time)) \ $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) -KBUILD_CFLAGS += $(call cc-option, -m32) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n
arch/x86/boot/compressed/Makefile +1 -0
@@ -12,6 +12,7 @@ KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_64) := -mcmodel=small KBUILD_CFLAGS += $(cflags-y) +KBUILD_CFLAGS += -mno-mmx -mno-sse KBUILD_CFLAGS += $(call cc-option,-ffreestanding) KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
arch/x86/kernel/crash.c +1 -1
@@ -95,10 +95,10 @@ void native_machine_crash_shutdown(struct pt_regs *regs)cpu_emergency_vmxoff ();cpu_emergency_svm_disable (); -lapic_shutdown ();#if defined(CONFIG_X86_IO_APIC )disable_IO_APIC ();#endif +lapic_shutdown ();#ifdef CONFIG_HPET_TIMER hpet_disable ();#endif
arch/x86/kernel/microcode_amd.c +1 -1
@@ -331,7 +331,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device)snprintf (fw_name,sizeof (fw_name),"amd-ucode/microcode_amd_fam%.2xh.bin" , c->x86);if (request_firmware (&fw, (const char *)fw_name, device)) { -pr_err ("failed to load file %s\n" , fw_name); +pr_debug ("failed to load file %s\n" , fw_name); goto out; }
arch/x86/kernel/reboot.c +7 -4
@@ -652,6 +652,13 @@ void native_machine_shutdown(void)/* The boot cpu is always logical cpu 0 */ int reboot_cpu_id =0 ; +#endif + +#ifdef CONFIG_X86_IO_APIC +disable_IO_APIC (); +#endif + +#ifdef CONFIG_SMP #ifdef CONFIG_X86_32 /* See if there has been given a command line override */
@@ -675,10 +682,6 @@ void native_machine_shutdown(void)lapic_shutdown (); -#ifdef CONFIG_X86_IO_APIC -disable_IO_APIC (); -#endif -#ifdef CONFIG_HPET_TIMER hpet_disable ();#endif
arch/x86/kvm/lapic.c +2 -1
@@ -537,7 +537,8 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)ASSERT (apic !=NULL );/* if initial count is 0, current count should also be 0 */ -if (apic_get_reg (apic,APIC_TMICT ) ==0 ) +if (apic_get_reg (apic,APIC_TMICT ) ==0 || + apic->lapic_timer.period ==0 )return 0 ; remaining =hrtimer_get_remaining (&apic->lapic_timer.timer);
arch/x86/platform/efi/efi.c +0 -5
@@ -614,11 +614,6 @@ void __init efi_init(void)set_bit (EFI_MEMMAP , &x86_efi_facility); -#ifdef CONFIG_X86_32 - x86_platform.get_wallclock = efi_get_time; - x86_platform.set_wallclock = efi_set_rtc_mmss; -#endif -#if EFI_DEBUG print_efi_memmap ();#endif
block/blk-core.c +2 -0
@@ -483,6 +483,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) }if (blk_throtl_init (q)) { +bdi_destroy (&q->backing_dev_info);kmem_cache_free (blk_requestq_cachep, q);return NULL ; }
@@ -2015,6 +2016,7 @@ void blk_start_request(struct request *req)if (unlikely (blk_bidi_rq (req))) req->next_rq->resid_len =blk_rq_bytes (req->next_rq); +BUG_ON (test_bit (REQ_ATOM_COMPLETE , &req->atomic_flags));blk_add_timer (req); }EXPORT_SYMBOL (blk_start_request);
block/blk-timeout.c +1 -2
@@ -90,8 +90,8 @@ static void blk_rq_timed_out(struct request *req)__blk_complete_request (req);break ;case BLK_EH_RESET_TIMER : -blk_clear_rq_complete (req);blk_add_timer (req); +blk_clear_rq_complete (req);break ;case BLK_EH_NOT_HANDLED :/*
@@ -173,7 +173,6 @@ void blk_add_timer(struct request *req)return ;BUG_ON (!list_empty (&req->timeout_list)); -BUG_ON (test_bit (REQ_ATOM_COMPLETE , &req->atomic_flags));/* * Some LLDs, like scsi, peek at the timeout to prevent a
crypto/algif_hash.c +3 -2
@@ -114,6 +114,9 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,struct hash_ctx *ctx = ask->private;int err; +if (flags &MSG_SENDPAGE_NOTLAST ) + flags |=MSG_MORE ; +lock_sock (sk);sg_init_table (ctx->sgl.sg,1 );sg_set_page (ctx->sgl.sg, page, size, offset);
@@ -161,8 +164,6 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock,else if (len < ds) msg->msg_flags |=MSG_TRUNC ; - msg->msg_namelen =0 ; -lock_sock (sk);if (ctx->more) { ctx->more =0 ;
crypto/algif_skcipher.c +3 -1
@@ -378,6 +378,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,struct skcipher_sg_list *sgl;int err = -EINVAL ; +if (flags &MSG_SENDPAGE_NOTLAST ) + flags |=MSG_MORE ; +lock_sock (sk);if (!ctx->more && ctx->used) goto unlock;
@@ -432,7 +435,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,long copied =0 ;lock_sock (sk); - msg->msg_namelen =0 ;for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen >0 ; iovlen--, iov++) {unsigned long seglen = iov->iov_len;
crypto/ansi_cprng.c +2 -2
@@ -230,11 +230,11 @@ remainder:*/ if (byte_count <DEFAULT_BLK_SZ ) { empty_rbuf: -for (; ctx->rand_data_valid <DEFAULT_BLK_SZ ; - ctx->rand_data_valid++) { +while (ctx->rand_data_valid <DEFAULT_BLK_SZ ) { *ptr = ctx->rand_data[ctx->rand_data_valid]; ptr++; byte_count--; + ctx->rand_data_valid++;if (byte_count ==0 ) goto done; }
crypto/authenc.c +4 -3
@@ -368,9 +368,10 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,if (!err) {struct crypto_aead *authenc =crypto_aead_reqtfm (areq);struct crypto_authenc_ctx *ctx =crypto_aead_ctx (authenc); -struct ablkcipher_request *abreq =aead_request_ctx (areq); -u8 *iv = (u8 *)(abreq +1 ) + -crypto_ablkcipher_reqsize (ctx->enc); +struct authenc_request_ctx *areq_ctx =aead_request_ctx (areq); +struct ablkcipher_request *abreq = (void *)(areq_ctx->tail + + ctx->reqoff); +u8 *iv = (u8 *)abreq -crypto_ablkcipher_ivsize (ctx->enc); err =crypto_authenc_genicv (areq, iv,0 ); }
crypto/ccm.c +2 -1
@@ -271,7 +271,8 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain, }/* compute plaintext into mac */ -get_data_to_compute (cipher, pctx, plain, cryptlen); +if (cryptlen) +get_data_to_compute (cipher, pctx, plain, cryptlen); out:return err;
drivers/ata/ahci.c +6 -0
@@ -303,6 +303,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI */ + { PCI_VDEVICE(INTEL, 0x9c83), board_ahci }, /* Wildcat Point-LP AHCI */ + { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -437,6 +441,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */ { PCI_DEVICE(0x1b4b, 0x91a3), .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), + .driver_data = board_ahci_yes_fbs },/* Promise */ { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
drivers/ata/ahci_platform.c +1 -0
@@ -204,6 +204,7 @@ static int __devexit ahci_remove(struct platform_device *pdev)static const struct of_device_id ahci_of_match[] = { { .compatible ="calxeda,hb-ahci" , }, + { .compatible ="ibm,476gtr-ahci" , }, {}, };MODULE_DEVICE_TABLE (of, ahci_of_match);
drivers/ata/libahci.c +16 -0
@@ -1247,9 +1247,11 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, {struct ata_port *ap = link->ap;struct ahci_host_priv *hpriv = ap->host->private_data; +struct ahci_port_priv *pp = ap->private_data;const char *reason =NULL ;unsigned long now, msecs;struct ata_taskfile tf; +bool fbs_disabled = false;int rc;DPRINTK ("ENTER\n" );
@@ -1259,6 +1261,16 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,if (rc && rc != -EOPNOTSUPP )ata_link_warn (link,"failed to reset engine (errno=%d)\n" , rc); +/* +* According to AHCI-1.2 9.3.9: if FBS is enable, software shall +* clear PxFBS.EN to '0' prior to issuing software reset to devices +* that is attached to port multiplier. +*/ +if (!ata_is_host_link (link) && pp->fbs_enabled) { +ahci_disable_fbs (ap); + fbs_disabled = true; + } +ata_tf_init (link->device, &tf);/* issue the first D2H Register FIS */
@@ -1299,6 +1311,10 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, }else *class =ahci_dev_classify (ap); +/* re-enable FBS if disabled before */ +if (fbs_disabled) +ahci_enable_fbs (ap); +DPRINTK ("EXIT, class=%u\n" , *class);return 0 ;
drivers/ata/libata-core.c +1 -0
@@ -4067,6 +4067,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 }, { "QUANTUM DAT DAT72-000", NULL, ATA_HORKAGE_ATAPI_MOD16_DMA }, { "Slimtype DVD A DS8A8SH", NULL, ATA_HORKAGE_MAX_SEC_LBA48 }, + { "Slimtype DVD A DS8A9SH", NULL, ATA_HORKAGE_MAX_SEC_LBA48 }, /* Devices we expect to fail diagnostics */
drivers/ata/libata-transport.c +8 -8
@@ -312,25 +312,25 @@ int ata_tport_add(struct device *parent,/* * ATA link attributes */ +static int noop (int x) {return x; } - -#define ata_link_show_linkspeed (field) \ +#define ata_link_show_linkspeed (field, format) \ static ssize_t \ show_ata_link_##field(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ struct ata_link *link = transport_class_to_link(dev); \ \ - return sprintf(buf,"%s\n", sata_spd_string(fls(link->field))); \ + return sprintf(buf, "%s\n", sata_spd_string(format(link->field))); \ } -#define ata_link_linkspeed_attr (field) \ - ata_link_show_linkspeed(field) \ +#define ata_link_linkspeed_attr (field, format) \ + ata_link_show_linkspeed(field, format) \ static DEVICE_ATTR(field, S_IRUGO, show_ata_link_##field, NULL) -ata_link_linkspeed_attr (hw_sata_spd_limit); -ata_link_linkspeed_attr (sata_spd_limit); -ata_link_linkspeed_attr (sata_spd); +ata_link_linkspeed_attr (hw_sata_spd_limit, fls); +ata_link_linkspeed_attr (sata_spd_limit, fls); +ata_link_linkspeed_attr (sata_spd, noop); static DECLARE_TRANSPORT_CLASS(ata_link_class,
drivers/atm/idt77252.c +1 -1
@@ -3513,7 +3513,7 @@ init_card(struct atm_dev *dev) tmp =dev_get_by_name (&init_net, tname);/* jhs: was "tmp = dev_get(tname);" */ if (tmp) {memcpy (card->atmdev->esi, tmp->dev_addr,6 ); - +dev_put (tmp);printk ("%s: ESI %pM\n" , card->name, card->atmdev->esi); }/*
drivers/block/brd.c +1 -1
@@ -547,7 +547,7 @@ static struct kobject *brd_probe(dev_t dev, int *part, void *data)mutex_lock (&brd_devices_mutex); brd =brd_init_one (MINOR (dev) >> part_shift); - kobj = brd ?get_disk (brd->brd_disk) :ERR_PTR (-ENOMEM ); + kobj = brd ?get_disk (brd->brd_disk) :NULL ;mutex_unlock (&brd_devices_mutex); *part =0 ;
drivers/block/loop.c +4 -2
@@ -1635,7 +1635,7 @@ static int loop_add(struct loop_device **l, int i) lo->lo_queue =blk_alloc_queue (GFP_KERNEL );if (!lo->lo_queue) - goto out_free_dev; + goto out_free_idr; disk = lo->lo_disk =alloc_disk (1 << part_shift);if (!disk)
@@ -1679,6 +1679,8 @@ static int loop_add(struct loop_device **l, int i) out_free_queue:blk_cleanup_queue (lo->lo_queue); +out_free_idr: +idr_remove (&loop_index_idr, i); out_free_dev:kfree (lo); out:
@@ -1742,7 +1744,7 @@ static struct kobject *loop_probe(dev_t dev, int *part, void *data)if (err <0 ) err =loop_add (&lo,MINOR (dev) >> part_shift);if (err <0 ) - kobj =ERR_PTR (err); + kobj =NULL ;else kobj =get_disk (lo->lo_disk);mutex_unlock (&loop_index_mutex);
drivers/char/i8k.c +7 -0
@@ -664,6 +664,13 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"), }, }, + { + .ident = "Dell XPS421", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"), + }, + }, { } };
drivers/connector/cn_proc.c +39 -27
194 lines not on this page · raw message
drivers/gpio/gpio-mpc8xxx.c +6 -2
@@ -69,10 +69,14 @@ static int mpc8572_gpio_get(struct gpio_chip *gc, unsigned int gpio)u32 val;struct of_mm_gpio_chip *mm =to_of_mm_gpio_chip (gc);struct mpc8xxx_gpio_chip *mpc8xxx_gc =to_mpc8xxx_gpio_chip (mm); +u32 out_mask, out_shadow; - val =in_be32 (mm->regs +GPIO_DAT ) & ~in_be32 (mm->regs +GPIO_DIR ); + out_mask =in_be32 (mm->regs +GPIO_DIR ); -return (val | mpc8xxx_gc->data) &mpc8xxx_gpio2mask (gpio); + val =in_be32 (mm->regs +GPIO_DAT ) & ~out_mask; + out_shadow = mpc8xxx_gc->data & out_mask; + +return (val | out_shadow) &mpc8xxx_gpio2mask (gpio); }static int mpc8xxx_gpio_get (struct gpio_chip *gc,unsigned int gpio)
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -6063,7 +6063,9 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) intel_crtc->cursor_visible = visible; }/* and commit changes on next vblank */ +POSTING_READ (CURCNTR (pipe));I915_WRITE (CURBASE (pipe), base); +POSTING_READ (CURBASE (pipe)); }static void ivb_update_cursor (struct drm_crtc *crtc,u32 base)
@@ -6088,7 +6090,9 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base) intel_crtc->cursor_visible = visible; }/* and commit changes on next vblank */ +POSTING_READ (CURCNTR_IVB (pipe));I915_WRITE (CURBASE_IVB (pipe), base); +POSTING_READ (CURBASE_IVB (pipe)); }/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
drivers/gpu/drm/nouveau/nouveau_gem.c +2 -1
@@ -281,7 +281,8 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence)list_for_each_safe (entry, tmp, list) { nvbo = list_entry(entry, struct nouveau_bo, entry); -nouveau_bo_fence (nvbo, fence); +if (likely (fence)) +nouveau_bo_fence (nvbo, fence);if (unlikely (nvbo->validate_mapped)) {ttm_bo_kunmap (&nvbo->kmap);
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +28 -0
@@ -416,12 +416,40 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc,/* Pin framebuffer & get tilling informations */ obj = radeon_fb->obj; rbo =gem_to_radeon_bo (obj); +retry: r =radeon_bo_reserve (rbo, false);if (unlikely (r !=0 ))return r; r =radeon_bo_pin (rbo,RADEON_GEM_DOMAIN_VRAM , &base);if (unlikely (r !=0 )) {radeon_bo_unreserve (rbo); + +/* On old GPU like RN50 with little vram pining can fails because +* current fb is taking all space needed. So instead of unpining +* the old buffer after pining the new one, first unpin old one +* and then retry pining new one. +* +* As only master can set mode only master can pin and it is +* unlikely the master client will race with itself especialy +* on those old gpu with single crtc. +* +* We don't shutdown the display controller because new buffer +* will end up in same spot. +*/ +if (!atomic && fb && fb != crtc->fb) { +struct radeon_bo *old_rbo; +unsigned long nsize, osize; + + old_rbo =gem_to_radeon_bo (to_radeon_framebuffer (fb)->obj); + osize =radeon_bo_size (old_rbo); + nsize =radeon_bo_size (rbo); +if (nsize <= osize && !radeon_bo_reserve (old_rbo, false)) { +radeon_bo_unpin (old_rbo); +radeon_bo_unreserve (old_rbo); + fb =NULL ; + goto retry; + } + }return -EINVAL ; }radeon_bo_get_tiling_flags (rbo, &tiling_flags,NULL );
drivers/gpu/drm/ttm/ttm_bo.c +20 -12
@@ -1101,24 +1101,32 @@ out_unlock:return ret; } -static int ttm_bo_mem_compat (struct ttm_placement *placement, -struct ttm_mem_reg *mem) +static bool ttm_bo_mem_compat (struct ttm_placement *placement, +struct ttm_mem_reg *mem, +uint32_t *new_flags) {int i;if (mem->mm_node && placement->lpfn !=0 && (mem->start < placement->fpfn || mem->start + mem->num_pages > placement->lpfn)) -return -1 ; +return false;for (i =0 ; i < placement->num_placement; i++) { -if ((placement->placement[i] & mem->placement & -TTM_PL_MASK_CACHING ) && - (placement->placement[i] & mem->placement & -TTM_PL_MASK_MEM )) -return i; + *new_flags = placement->placement[i]; +if ((*new_flags & mem->placement &TTM_PL_MASK_CACHING ) && + (*new_flags & mem->placement &TTM_PL_MASK_MEM )) +return true; + } + +for (i =0 ; i < placement->num_busy_placement; i++) { + *new_flags = placement->busy_placement[i]; +if ((*new_flags & mem->placement &TTM_PL_MASK_CACHING ) && + (*new_flags & mem->placement &TTM_PL_MASK_MEM )) +return true; } -return -1 ; + +return false; } int ttm_bo_validate(struct ttm_buffer_object *bo,
@@ -1127,6 +1135,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo, bool no_wait_gpu) {int ret; +uint32_t new_flags;BUG_ON (!atomic_read (&bo->reserved));/* Check that range is valid */
@@ -1137,8 +1146,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,/* * Check whether we need to move buffer. */ - ret =ttm_bo_mem_compat (placement, &bo->mem); -if (ret <0 ) { +if (!ttm_bo_mem_compat (placement, &bo->mem, &new_flags)) { ret =ttm_bo_move_buffer (bo, placement, interruptible, no_wait_reserve, no_wait_gpu);if (ret)return ret;
@@ -1147,7 +1155,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,* Use the access and other non-mapping-related flag bits from * the compatible memory placement flags to the active flags */ -ttm_flag_masked (&bo->mem.placement, placement->placement[ret], +ttm_flag_masked (&bo->mem.placement, new_flags, ~TTM_PL_MASK_MEMTYPE ); }/*
drivers/hid/hid-multitouch.c +1 -1
@@ -66,7 +66,7 @@ struct mt_device {unsigned last_field_index;/* last field index of the report */ unsigned last_slot_field;/* the last field of a slot */ int last_mt_collection;/* last known mt-related collection */ -__s8 inputmode;/* InputMode HID feature, -1 if non-existent */ +__s16 inputmode;/* InputMode HID feature, -1 if non-existent */ __u8 num_received;/* how many contacts we received */ __u8 num_expected;/* expected last contact index */ __u8 maxcontacts;
drivers/hwmon/lm78.c +2 -0
@@ -90,6 +90,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) {if (rpm <=0 )return 255 ; +if (rpm >1350000 ) +return 1 ;return SENSORS_LIMIT ((1350000 + rpm * div /2 ) / (rpm * div),1 ,254 ); }
drivers/hwmon/lm90.c +7 -4
@@ -268,7 +268,7 @@ static const struct lm90_params lm90_params[] = { [max6696] = { .flags =LM90_HAVE_EMERGENCY | LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3, - .alert_alarms = 0x187c, + .alert_alarms = 0x1c7c, .max_convrate = 6, .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, },
@@ -1474,19 +1474,22 @@ static void lm90_alert(struct i2c_client *client, unsigned int flag)if ((alarms &0x7f ) ==0 && (alarms2 &0xfe ) ==0 ) {dev_info (&client->dev,"Everything OK\n" ); }else { -if (alarms &0x61 ) +if ((alarms &0x61 ) || (alarms2 &0x80 ))dev_warn (&client->dev,"temp%d out of range, please check!\n" ,1 ); -if (alarms &0x1a ) +if ((alarms &0x1a ) || (alarms2 &0x20 ))dev_warn (&client->dev,"temp%d out of range, please check!\n" ,2 );if (alarms &0x04 )dev_warn (&client->dev,"temp%d diode open, please check!\n" ,2 ); -if (alarms2 &0x18 ) +if (alarms2 &0x5a )dev_warn (&client->dev,"temp%d out of range, please check!\n" ,3 ); +if (alarms2 &0x04 ) +dev_warn (&client->dev, +"temp%d diode open, please check!\n" ,3 );/* Disable ALERT# output, because these chips don't implement SMBus alert correctly; they should only hold the alert line
drivers/hwmon/sis5595.c +2 -0
@@ -133,6 +133,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) {if (rpm <=0 )return 255 ; +if (rpm >1350000 ) +return 1 ;return SENSORS_LIMIT ((1350000 + rpm * div /2 ) / (rpm * div),1 ,254 ); }
drivers/hwmon/vt8231.c +1 -1
@@ -139,7 +139,7 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 };*/ static inline u8 FAN_TO_REG (long rpm,int div) { -if (rpm ==0 ) +if (rpm <=0 || rpm >1310720 )return 0 ;return SENSORS_LIMIT (1310720 / (rpm * div),1 ,255 ); }
drivers/hwmon/w83l786ng.c +9 -5
@@ -447,8 +447,11 @@ store_pwm(struct device *dev, struct device_attribute *attr,struct w83l786ng_data *data =i2c_get_clientdata (client);u32 val =SENSORS_LIMIT (simple_strtoul (buf,NULL ,10 ),0 ,255 ); + val =DIV_ROUND_CLOSEST (val,0x11 ); +mutex_lock (&data->update_lock); - data->pwm[nr] = val; + data->pwm[nr] = val *0x11 ; + val |=w83l786ng_read_value (client,W83L786NG_REG_PWM [nr]) &0xf0 ;w83l786ng_write_value (client,W83L786NG_REG_PWM [nr], val);mutex_unlock (&data->update_lock);return count;
@@ -471,7 +474,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,mutex_lock (&data->update_lock); reg =w83l786ng_read_value (client,W83L786NG_REG_FAN_CFG ); data->pwm_enable[nr] = val; - reg &= ~(0x02 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); + reg &= ~(0x03 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); reg |= (val -1 ) <<W83L786NG_PWM_ENABLE_SHIFT [nr];w83l786ng_write_value (client,W83L786NG_REG_FAN_CFG , reg);mutex_unlock (&data->update_lock);
@@ -740,9 +743,10 @@ static struct w83l786ng_data *w83l786ng_update_device(struct device *dev) ((pwmcfg >>W83L786NG_PWM_MODE_SHIFT [i]) &1 ) ?0 :1 ; data->pwm_enable[i] = - ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &2 ) +1 ; - data->pwm[i] =w83l786ng_read_value (client, -W83L786NG_REG_PWM [i]); + ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &3 ) +1 ; + data->pwm[i] = + (w83l786ng_read_value (client,W83L786NG_REG_PWM [i]) + &0x0f ) *0x11 ; }
drivers/infiniband/hw/ipath/ipath_user_sdma.c +1 -6
@@ -280,9 +280,7 @@ static int ipath_user_sdma_pin_pages(const struct ipath_devdata *dd,int j;int ret; - ret =get_user_pages (current, current->mm, addr, - npages,0 ,1 , pages,NULL ); - + ret =get_user_pages_fast (addr, npages,0 , pages);if (ret != npages) {int i;
@@ -811,10 +809,7 @@ int ipath_user_sdma_writev(struct ipath_devdata *dd,while (dim) {const int mxp =8 ; -down_write (¤t->mm->mmap_sem); ret =ipath_user_sdma_queue_pkts (dd, pq, &list, iov, dim, mxp); -up_write (¤t->mm->mmap_sem); -if (ret <=0 ) goto done_unlock;else {
drivers/infiniband/hw/qib/qib_user_sdma.c +1 -5
@@ -284,8 +284,7 @@ static int qib_user_sdma_pin_pages(const struct qib_devdata *dd,int j;int ret; - ret =get_user_pages (current, current->mm, addr, - npages,0 ,1 , pages,NULL ); + ret =get_user_pages_fast (addr, npages,0 , pages);if (ret != npages) {int i;
@@ -830,10 +829,7 @@ int qib_user_sdma_writev(struct qib_ctxtdata *rcd,while (dim) {const int mxp =8 ; -down_write (¤t->mm->mmap_sem); ret =qib_user_sdma_queue_pkts (dd, pq, &list, iov, dim, mxp); -up_write (¤t->mm->mmap_sem); -if (ret <=0 ) goto done_unlock;else {
drivers/isdn/isdnloop/isdnloop.c +5 -3
@@ -1083,8 +1083,10 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)spin_unlock_irqrestore (&card->isdnloop_lock, flags);return -ENOMEM ; } -for (i =0 ; i <3 ; i++) -strcpy (card->s0num[i], sdef.num[i]); +for (i =0 ; i <3 ; i++) { +strlcpy (card->s0num[i], sdef.num[i], +sizeof (card->s0num[0 ])); + }break ;case ISDN_PTYPE_1TR6 : if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95",
@@ -1097,7 +1099,7 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)spin_unlock_irqrestore (&card->isdnloop_lock, flags);return -ENOMEM ; } -strcpy (card->s0num[0 ], sdef.num[0 ]); +strlcpy (card->s0num[0 ], sdef.num[0 ],sizeof (card->s0num[0 ])); card->s0num[1 ][0 ] ='\0' ; card->s0num[2 ][0 ] ='\0' ;break ;
drivers/isdn/mISDN/socket.c +4 -9
@@ -117,7 +117,6 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock, {struct sk_buff *skb;struct sock *sk = sock->sk; -struct sockaddr_mISDN *maddr;int copied, err;
@@ -135,9 +134,9 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,if (!skb)return err; -if (msg->msg_namelen >=sizeof (struct sockaddr_mISDN )) { - msg->msg_namelen =sizeof (struct sockaddr_mISDN ); - maddr = (struct sockaddr_mISDN *)msg->msg_name; +if (msg->msg_name) { +struct sockaddr_mISDN *maddr = msg->msg_name; + maddr->family =AF_ISDN ; maddr->dev =_pms (sk)->dev->id; if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||
@@ -150,11 +149,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock, maddr->sapi =_pms (sk)->ch.addr &0xFF ; maddr->tei = (_pms (sk)->ch.addr >>8 ) &0xFF ; } - }else { -if (msg->msg_namelen) -printk (KERN_WARNING "%s: too small namelen %d\n" , - __func__, msg->msg_namelen); - msg->msg_namelen =0 ; + msg->msg_namelen =sizeof (*maddr); } copied = skb->len +MISDN_HEADER_LEN ;
drivers/md/dm-bufio.c +5 -0
@@ -1611,6 +1611,11 @@ static int __init dm_bufio_init(void) {__u64 mem; + dm_bufio_allocated_kmem_cache =0 ; + dm_bufio_allocated_get_free_pages =0 ; + dm_bufio_allocated_vmalloc =0 ; + dm_bufio_current_allocated =0 ; +memset (&dm_bufio_caches,0 ,sizeof dm_bufio_caches);memset (&dm_bufio_cache_names,0 ,sizeof dm_bufio_cache_names);
drivers/md/dm-delay.c +11 -12
@@ -20,6 +20,7 @@struct delay_c {struct timer_list delay_timer;struct mutex timer_lock; +struct workqueue_struct *kdelayd_wq;struct work_struct flush_expired_bios;struct list_head delayed_bios;atomic_t may_delay;
@@ -45,14 +46,13 @@ struct dm_delay_info {static DEFINE_MUTEX (delayed_bios_lock); -static struct workqueue_struct *kdelayd_wq;static struct kmem_cache *delayed_cache;static void handle_delayed_timer (unsigned long data) {struct delay_c *dc = (struct delay_c *)data; -queue_work (kdelayd_wq, &dc->flush_expired_bios); +queue_work (dc->kdelayd_wq, &dc->flush_expired_bios); }static void queue_timeout (struct delay_c *dc,unsigned long expires)
@@ -190,6 +190,12 @@ out: goto bad_dev_write; } + dc->kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); +if (!dc->kdelayd_wq) { +DMERR ("Couldn't start kdelayd" ); + goto bad_queue; + } +setup_timer (&dc->delay_timer, handle_delayed_timer, (unsigned long )dc);INIT_WORK (&dc->flush_expired_bios, flush_expired_bios);
@@ -202,6 +208,8 @@ out: ti->private = dc;return 0 ; +bad_queue: +mempool_destroy (dc->delayed_pool); bad_dev_write:if (dc->dev_write)dm_put_device (ti, dc->dev_write);
@@ -216,7 +224,7 @@ static void delay_dtr(struct dm_target *ti) {struct delay_c *dc = ti->private; -flush_workqueue (kdelayd_wq); +destroy_workqueue (dc->kdelayd_wq);dm_put_device (ti, dc->dev_read);
@@ -350,12 +358,6 @@ static int __init dm_delay_init(void) {int r = -ENOMEM ; - kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); -if (!kdelayd_wq) { -DMERR ("Couldn't start kdelayd" ); - goto bad_queue; - } - delayed_cache =KMEM_CACHE (dm_delay_info,0 );if (!delayed_cache) {DMERR ("Couldn't create delayed bio cache." );
@@ -373,8 +375,6 @@ static int __init dm_delay_init(void) bad_register:kmem_cache_destroy (delayed_cache); bad_memcache: -destroy_workqueue (kdelayd_wq); -bad_queue:return r; }
@@ -382,7 +382,6 @@ static void __exit dm_delay_exit(void) {dm_unregister_target (&delay_target);kmem_cache_destroy (delayed_cache); -destroy_workqueue (kdelayd_wq); }/* Module hooks */
drivers/md/dm-mpath.c +15 -3
@@ -84,6 +84,7 @@ struct multipath {unsigned queue_io;/* Must we queue all I/O? */ unsigned queue_if_no_path;/* Queue I/O if last path fails? */ unsigned saved_queue_if_no_path;/* Saved state during suspension */ + unsigned pg_init_disabled:1; /* pg_init is not currently allowed */unsigned pg_init_retries;/* Number of times to retry pg_init */ unsigned pg_init_count;/* Number of times pg_init called */ unsigned pg_init_delay_msecs;/* Number of msecs before pg_init retry */
@@ -473,7 +474,8 @@ static void process_queued_ios(struct work_struct *work) (!pgpath && !m->queue_if_no_path)) must_queue =0 ; -if (m->pg_init_required && !m->pg_init_in_progress && pgpath) +if (m->pg_init_required && !m->pg_init_in_progress && pgpath && + !m->pg_init_disabled)__pg_init_all_paths (m); out:
@@ -887,10 +889,20 @@ static void multipath_wait_for_pg_init_completion(struct multipath *m)static void flush_multipath_work (struct multipath *m) { +unsigned long flags; + +spin_lock_irqsave (&m->lock, flags); + m->pg_init_disabled =1 ; +spin_unlock_irqrestore (&m->lock, flags); +flush_workqueue (kmpath_handlerd);multipath_wait_for_pg_init_completion (m);flush_workqueue (kmultipathd);flush_work_sync (&m->trigger_event); + +spin_lock_irqsave (&m->lock, flags); + m->pg_init_disabled =0 ; +spin_unlock_irqrestore (&m->lock, flags); }static void multipath_dtr (struct dm_target *ti)
@@ -1111,7 +1123,7 @@ static int pg_init_limit_reached(struct multipath *m, struct pgpath *pgpath)spin_lock_irqsave (&m->lock, flags); -if (m->pg_init_count <= m->pg_init_retries) +if (m->pg_init_count <= m->pg_init_retries && !m->pg_init_disabled) m->pg_init_required =1 ;else limit_reached =1 ;
@@ -1621,7 +1633,7 @@ out:*---------------------------------------------------------------*/ static struct target_type multipath_target = { .name ="multipath" , - .version = {1 ,3 ,1 }, + .version = {1 ,3 ,2 }, .module =THIS_MODULE , .ctr = multipath_ctr, .dtr = multipath_dtr,
drivers/md/dm-snap.c +64 -7
114 lines not on this page · raw message
drivers/md/dm-table.c +21 -2
@@ -215,6 +215,11 @@ int dm_table_create(struct dm_table **result, fmode_t mode, num_targets =dm_round_up (num_targets,KEYS_PER_NODE ); +if (!num_targets) { +kfree (t); +return -ENOMEM ; + } +if (alloc_targets (t, num_targets)) {kfree (t); t =NULL ;
@@ -581,14 +586,28 @@ static int adjoin(struct dm_table *table, struct dm_target *ti)/* * Used to dynamically allocate the arg array. +* +* We do first allocation with GFP_NOIO because dm-mpath and dm-thin must +* process messages even if some device is suspended. These messages have a +* small fixed number of arguments. +* +* On the other hand, dm-switch needs to process bulk data using messages and +* excessive use of GFP_NOIO could cause trouble. */ static char **realloc_argv (unsigned *array_size,char **old_argv) {char **argv;unsigned new_size; +gfp_t gfp; - new_size = *array_size ? *array_size *2 :64 ; - argv =kmalloc (new_size *sizeof (*argv),GFP_KERNEL ); +if (*array_size) { + new_size = *array_size *2 ; + gfp =GFP_KERNEL ; + }else { + new_size =8 ; + gfp =GFP_NOIO ; + } + argv =kmalloc (new_size *sizeof (*argv), gfp);if (argv) {memcpy (argv, old_argv, *array_size *sizeof (*argv)); *array_size = new_size;
drivers/media/video/saa7164/saa7164-core.c +3 -1
@@ -1386,9 +1386,11 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,if (fw_debug) { dev->kthread =kthread_run (saa7164_thread_function, dev,"saa7164 debug" ); -if (!dev->kthread) +if (IS_ERR (dev->kthread)) { + dev->kthread =NULL ;printk (KERN_ERR "%s() Failed to create " "debug kernel thread\n" , __func__); + } } }/* != BOARD_UNKNOWN */
drivers/misc/enclosure.c +7 -0
@@ -198,6 +198,13 @@ static void enclosure_remove_links(struct enclosure_component *cdev) {char name[ENCLOSURE_NAME_SIZE ]; +/* +* In odd circumstances, like multipath devices, something else may +* already have removed the links, so check for this condition first. +*/ +if (!cdev->dev->kobj.sd) +return ; +enclosure_link_name (cdev, name);sysfs_remove_link (&cdev->dev->kobj, name);sysfs_remove_link (&cdev->cdev.kobj,"device" );
drivers/mmc/card/block.c +44 -3
95 lines not on this page · raw message
drivers/mtd/devices/m25p80.c +7 -12
@@ -71,7 +71,7 @@/* Define max times to check status register before we give up. */ #define MAX_READY_WAIT_JIFFIES (40 * HZ)/* M25P16 specs 40s max chip erase */ -#define MAX_CMD_SIZE 5 +#define MAX_CMD_SIZE 6#ifdef CONFIG_M25PXX_USE_FAST_READ #define OPCODE_READ OPCODE_FAST_READ
@@ -874,14 +874,13 @@ static int __devinit m25p_probe(struct spi_device *spi) } } - flash =kzalloc (sizeof *flash,GFP_KERNEL ); + flash =devm_kzalloc (&spi->dev,sizeof (*flash),GFP_KERNEL );if (!flash)return -ENOMEM ; - flash->command =kmalloc (MAX_CMD_SIZE +FAST_READ_DUMMY_BYTE ,GFP_KERNEL ); -if (!flash->command) { -kfree (flash); + + flash->command =devm_kzalloc (&spi->dev,MAX_CMD_SIZE ,GFP_KERNEL ); +if (!flash->command)return -ENOMEM ; - } flash->spi = spi;mutex_init (&flash->lock);
@@ -978,14 +977,10 @@ static int __devinit m25p_probe(struct spi_device *spi) static int __devexit m25p_remove(struct spi_device *spi) {struct m25p *flash =dev_get_drvdata (&spi->dev); -int status;/* Clean up MTD stuff. */ - status =mtd_device_unregister (&flash->mtd); -if (status ==0 ) { -kfree (flash->command); -kfree (flash); - } +mtd_device_unregister (&flash->mtd); +return 0 ; }
drivers/mtd/nand/gpmi-nand/gpmi-nand.c +2 -2
@@ -227,8 +227,6 @@ static void dma_irq_callback(void *param)struct gpmi_nand_data *this = param;struct completion *dma_c = &this->dma_done; -complete (dma_c); -switch (this->dma_type) {case DMA_FOR_COMMAND :dma_unmap_sg (this->dev, &this->cmd_sgl,1 ,DMA_TO_DEVICE );
@@ -253,6 +251,8 @@ static void dma_irq_callback(void *param)default :pr_err ("in wrong DMA operation.\n" ); } + +complete (dma_c); } int start_dma_without_bch_irq(struct gpmi_nand_data *this,
drivers/mtd/nand/nand_base.c +14 -2
@@ -2895,10 +2895,22 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,sanitize_string (p->model,sizeof (p->model));if (!mtd->name) mtd->name = p->model; + mtd->writesize =le32_to_cpu (p->byte_per_page); - mtd->erasesize =le32_to_cpu (p->pages_per_block) * mtd->writesize; + +/* +* pages_per_block and blocks_per_lun may not be a power-of-2 size +* (don't ask me who thought of this...). MTD assumes that these +* dimensions will be power-of-2, so just truncate the remaining area. +*/ + mtd->erasesize =1 << (fls (le32_to_cpu (p->pages_per_block)) -1 ); + mtd->erasesize *= mtd->writesize; + mtd->oobsize =le16_to_cpu (p->spare_bytes_per_page); - chip->chipsize = (uint64_t )le32_to_cpu (p->blocks_per_lun) * mtd->erasesize; + +/* See erasesize comment */ + chip->chipsize =1 << (fls (le32_to_cpu (p->blocks_per_lun)) -1 ); + chip->chipsize *= (uint64_t )mtd->erasesize; *busw =0 ;if (le16_to_cpu (p->features) &1 ) *busw =NAND_BUSWIDTH_16 ;
drivers/net/bonding/bond_sysfs.c +9 -2
@@ -534,8 +534,9 @@ static ssize_t bonding_store_arp_interval(struct device *d, goto out; }if (bond->params.mode ==BOND_MODE_ALB || - bond->params.mode ==BOND_MODE_TLB ) { -pr_info ("%s: ARP monitoring cannot be used with ALB/TLB. Only MII monitoring is supported on %s.\n" , + bond->params.mode ==BOND_MODE_TLB || + bond->params.mode ==BOND_MODE_8023AD ) { +pr_info ("%s: ARP monitoring cannot be used with ALB/TLB/802.3ad. Only MII monitoring is supported on %s.\n" , bond->dev->name, bond->dev->name); ret = -EINVAL ; goto out;
@@ -693,6 +694,8 @@ static ssize_t bonding_store_downdelay(struct device *d,int new_value, ret = count;struct bonding *bond =to_bond (d); +if (!rtnl_trylock ()) +return restart_syscall ();if (!(bond->params.miimon)) {pr_err ("%s: Unable to set down delay as MII monitoring is disabled\n" , bond->dev->name);
@@ -726,6 +729,7 @@ static ssize_t bonding_store_downdelay(struct device *d, } out: +rtnl_unlock ();return ret; } static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR,
@@ -748,6 +752,8 @@ static ssize_t bonding_store_updelay(struct device *d,int new_value, ret = count;struct bonding *bond =to_bond (d); +if (!rtnl_trylock ()) +return restart_syscall ();if (!(bond->params.miimon)) {pr_err ("%s: Unable to set up delay as MII monitoring is disabled\n" , bond->dev->name);
@@ -781,6 +787,7 @@ static ssize_t bonding_store_updelay(struct device *d, } out: +rtnl_unlock ();return ret; } static DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR,
drivers/net/can/c_can/c_can.c +3 -3
@@ -764,9 +764,6 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota) msg_ctrl_save = priv->read_reg (priv, &priv->regs->ifregs[0 ].msg_cntrl); -if (msg_ctrl_save &IF_MCONT_EOB ) -return num_rx_pkts; -if (msg_ctrl_save &IF_MCONT_MSGLST ) {c_can_handle_lost_msg_obj (dev,0 , msg_obj); num_rx_pkts++;
@@ -774,6 +771,9 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)continue ; } +if (msg_ctrl_save &IF_MCONT_EOB ) +return num_rx_pkts; +if (!(msg_ctrl_save &IF_MCONT_NEWDAT ))continue ;
drivers/net/can/sja1000/sja1000.c +9 -8
@@ -488,19 +488,19 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)uint8_t isrc, status;int n =0 ; -/* Shared interrupts and IRQ off? */ -if (priv->read_reg (priv,REG_IER ) ==IRQ_OFF ) -return IRQ_NONE ; -if (priv->pre_irq) priv->pre_irq (priv); +/* Shared interrupts and IRQ off? */ +if (priv->read_reg (priv,REG_IER ) ==IRQ_OFF ) + goto out; +while ((isrc = priv->read_reg (priv,REG_IR )) && (n <SJA1000_MAX_IRQ )) { - n++; + status = priv->read_reg (priv,SJA1000_REG_SR );/* check for absent controller due to hw unplug */ if (status ==0xFF &&sja1000_is_absent (priv)) -return IRQ_NONE ; + goto out;if (isrc &IRQ_WUI )dev_warn (dev->dev.parent,"wakeup interrupt\n" );
@@ -519,7 +519,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id) status = priv->read_reg (priv,SJA1000_REG_SR );/* check for absent controller */ if (status ==0xFF &&sja1000_is_absent (priv)) -return IRQ_NONE ; + goto out; } }if (isrc & (IRQ_DOI |IRQ_EI |IRQ_BEI |IRQ_EPI |IRQ_ALI )) {
@@ -527,8 +527,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)if (sja1000_err (dev, isrc, status))break ; } + n++; } - +out:if (priv->post_irq) priv->post_irq (priv);
drivers/net/ethernet/smsc/smc91x.h +4 -18
@@ -46,7 +46,8 @@defined (CONFIG_MACH_LITTLETON ) ||\defined (CONFIG_MACH_ZYLONITE2 ) ||\defined (CONFIG_ARCH_VIPER ) ||\ - defined(CONFIG_MACH_STARGATE2) +defined (CONFIG_MACH_STARGATE2 ) ||\ + defined(CONFIG_ARCH_VERSATILE)#include <asm/mach-types.h>
@@ -154,6 +155,8 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)#define SMC_outl (v, a, r) writel(v, (a) + (r))#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l)#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) +#define SMC_insw (a, r, p, l) readsw((a) + (r), p, l) +#define SMC_outsw (a, r, p, l) writesw((a) + (r), p, l)#define SMC_IRQ_FLAGS (-1)/* from resource */ /* We actually can't write halfwords properly if not word aligned */
@@ -206,23 +209,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)#define RPC_LSA_DEFAULT RPC_LED_TX_RX#define RPC_LSB_DEFAULT RPC_LED_100_10 -#elif defined(CONFIG_ARCH_VERSATILE ) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 -#define SMC_NOWAIT 1 - -#define SMC_inb (a, r) readb((a) + (r)) -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_inl (a, r) readl((a) + (r)) -#define SMC_outb (v, a, r) writeb(v, (a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_outl (v, a, r) writel(v, (a) + (r)) -#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) -#define SMC_IRQ_FLAGS (-1)/* from resource */ -#elif defined(CONFIG_MN10300 )/*
drivers/net/ppp/pppoe.c +0 -2
@@ -985,8 +985,6 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,if (error <0 ) goto end; - m->msg_namelen =0 ; -if (skb) { total_len =min_t (size_t, total_len, skb->len); error =skb_copy_datagram_iovec (skb,0 , m->msg_iov, total_len);
drivers/net/wireless/libertas/debugfs.c +5 -1
@@ -919,7 +919,10 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,char *p2;struct debug_data *d = f->private_data; - pdata =kmalloc (cnt,GFP_KERNEL ); +if (cnt ==0 ) +return 0 ; + + pdata =kmalloc (cnt +1 ,GFP_KERNEL );if (pdata ==NULL )return 0 ;
@@ -928,6 +931,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,kfree (pdata);return 0 ; } + pdata[cnt] ='\0' ; p0 = pdata;for (i =0 ; i < num_of_items; i++) {
drivers/net/wireless/mwifiex/sdio.c +3 -0
@@ -936,7 +936,10 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb, u32 upld_typ) {u8 *cmd_buf; +__le16 *curr_ptr = (__le16 *)skb->data; +u16 pkt_len =le16_to_cpu (*curr_ptr); +skb_trim (skb, pkt_len);skb_pull (skb,INTF_HEADER_LEN );switch (upld_typ) {
drivers/net/wireless/prism54/islpci_dev.c +5 -2
@@ -812,6 +812,10 @@ static const struct net_device_ops islpci_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; +static struct device_type wlan_type = { + .name ="wlan" , +}; +struct net_device *islpci_setup (struct pci_dev *pdev) {
@@ -822,9 +826,8 @@ islpci_setup(struct pci_dev *pdev)return ndev;pci_set_drvdata (pdev, ndev); -#if defined(SET_NETDEV_DEV )SET_NETDEV_DEV (ndev, &pdev->dev); -#endif +SET_NETDEV_DEVTYPE (ndev, &wlan_type);/* setup the structure members */ ndev->base_addr =pci_resource_start (pdev,0 );
drivers/net/wireless/rt2x00/rt2400pci.c +1 -1
@@ -1253,7 +1253,7 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry,*/ rxdesc->timestamp = ((u64 )rx_high <<32 ) | rx_low; rxdesc->signal =rt2x00_get_field32 (word2,RXD_W2_SIGNAL ) & ~0x08 ; - rxdesc->rssi =rt2x00_get_field32 (word2,RXD_W3_RSSI ) - + rxdesc->rssi =rt2x00_get_field32 (word3,RXD_W3_RSSI ) - entry->queue->rt2x00dev->rssi_offset; rxdesc->size =rt2x00_get_field32 (word0,RXD_W0_DATABYTE_COUNT );
drivers/net/wireless/rt2x00/rt2x00mac.c +3 -0
@@ -771,6 +771,9 @@ void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop)struct rt2x00_dev *rt2x00dev = hw->priv;struct data_queue *queue; +if (!test_bit (DEVICE_STATE_PRESENT , &rt2x00dev->flags)) +return ; +tx_queue_for_each (rt2x00dev, queue)rt2x00queue_flush_queue (queue, drop); }
drivers/net/wireless/rtlwifi/base.c +41 -49
107 lines not on this page · raw message
drivers/net/wireless/rtlwifi/rtl8192cu/mac.c +3 -3
@@ -782,7 +782,7 @@ static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw, static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, struct rtl_stats *pstats, - struct rx_desc_92c *pdesc, + struct rx_desc_92c *p_desc, struct rx_fwinfo_92c *p_drvinfo, bool packet_match_bssid, bool packet_toself,
@@ -797,11 +797,11 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,u32 rssi, total_rssi =0 ;bool in_powersavemode = false;bool is_cck_rate; +u8 *pdesc = (u8 *)p_desc; - is_cck_rate =RX_HAL_IS_CCK_RATE (pdesc); + is_cck_rate =RX_HAL_IS_CCK_RATE (p_desc); pstats->packet_matchbssid = packet_match_bssid; pstats->packet_toself = packet_toself; - pstats->is_cck = is_cck_rate; pstats->packet_beacon = packet_beacon; pstats->is_cck = is_cck_rate; pstats->RX_SIGQ[0 ] =-1 ;
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +4 -4
@@ -303,10 +303,10 @@ out:bool rtl92cu_rx_query_desc (struct ieee80211_hw *hw,struct rtl_stats *stats,struct ieee80211_rx_status *rx_status, -u8 *p_desc,struct sk_buff *skb) +u8 *pdesc,struct sk_buff *skb) {struct rx_fwinfo_92c *p_drvinfo; -struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc; +struct rx_desc_92c *p_desc = (struct rx_desc_92c *)pdesc;u32 phystatus =GET_RX_DESC_PHY_STATUS (pdesc); stats->length = (u16 )GET_RX_DESC_PKT_LEN (pdesc);
@@ -345,11 +345,11 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,if (phystatus) { p_drvinfo = (struct rx_fwinfo_92c *)(skb->data + stats->rx_bufshift); -rtl92c_translate_rx_signal_stuff (hw, skb, stats, pdesc, +rtl92c_translate_rx_signal_stuff (hw, skb, stats, p_desc, p_drvinfo); }/*rx_status->qual = stats->signal; */ - rx_status->signal = stats->rssi +10 ; + rx_status->signal = stats->recvsignalpower +10 ;/*rx_status->noise = -stats->noise; */ return true; }
drivers/net/wireless/rtlwifi/rtl8192de/trx.c +1 -1
@@ -529,7 +529,7 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats, p_drvinfo); }/*rx_status->qual = stats->signal; */ - rx_status->signal = stats->rssi +10 ; + rx_status->signal = stats->recvsignalpower +10 ;/*rx_status->noise = -stats->noise; */ return true; }
drivers/net/wireless/rtlwifi/rtl8192se/rf.c +1 -1
@@ -274,7 +274,7 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw, rtlefuse->pwrgroup_ht40 [RF90_PATH_A][chnl - 1]) { pwrdiff_limit[i] = - rtlefuse->pwrgroup_ht20 + rtlefuse->pwrgroup_ht40 [RF90_PATH_A ][chnl -1 ]; } }else {
drivers/net/wireless/rtlwifi/rtl8192se/trx.c +1 -1
@@ -582,7 +582,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats, }/*rx_status->qual = stats->signal; */ - rx_status->signal = stats->rssi +10 ; + rx_status->signal = stats->recvsignalpower +10 ;/*rx_status->noise = -stats->noise; */ return true;
drivers/net/wireless/rtlwifi/wifi.h +1 -5
@@ -73,11 +73,7 @@#define RTL_SLOT_TIME_9 9#define RTL_SLOT_TIME_20 20 -/*related with tcp/ip. */ -/*if_ehther.h*/ -#define ETH_P_PAE 0x888E/*Port Access Entity (IEEE 802.1X) */ -#define ETH_P_IP 0x0800/*Internet Protocol packet */ -#define ETH_P_ARP 0x0806/*Address Resolution packet */ +/*related to tcp/ip. */ #define SNAP_SIZE 6#define PROTOC_TYPE_SIZE 2
drivers/pci/pcie/portdrv_pci.c +0 -1
@@ -151,7 +151,6 @@ static int __devinit pcie_portdrv_probe(struct pci_dev *dev,static void pcie_portdrv_remove (struct pci_dev *dev) {pcie_port_device_remove (dev); -pci_disable_device (dev); }static int error_detected_iter (struct device *device,void *data)
drivers/rtc/rtc-at91rm9200.c +2 -0
@@ -156,6 +156,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) at91_alarm_year = tm.tm_year; + tm.tm_mon = alrm->time.tm_mon; + tm.tm_mday = alrm->time.tm_mday; tm.tm_hour = alrm->time.tm_hour; tm.tm_min = alrm->time.tm_min; tm.tm_sec = alrm->time.tm_sec;
drivers/s390/net/qeth_core_main.c +5 -1
@@ -4322,7 +4322,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd;struct qeth_snmp_ureq *ureq; -int req_len; +unsigned int req_len;struct qeth_arp_query_info qinfo = {0 , };int rc =0 ;
@@ -4338,6 +4338,10 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)/* skip 4 bytes (data_len struct member) to get req_len */ if (copy_from_user (&req_len, udata +sizeof (int ),sizeof (int )))return -EFAULT ; +if (req_len > (QETH_BUFSIZE -IPA_PDU_HEADER_SIZE - +sizeof (struct qeth_ipacmd_hdr ) - +sizeof (struct qeth_ipacmd_setadpparms_hdr ))) +return -EINVAL ; ureq =memdup_user (udata, req_len +sizeof (struct qeth_snmp_ureq_hdr ));if (IS_ERR (ureq)) {QETH_CARD_TEXT (card,2 ,"snmpnome" );
drivers/scsi/aacraid/commctrl.c +2 -1
@@ -508,7 +508,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) goto cleanup; } -if (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr ))) { +if ((fibsize < (sizeof (struct user_aac_srb ) -sizeof (struct user_sgentry ))) || + (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr )))) { rcode = -EINVAL ; goto cleanup; }
drivers/scsi/hpsa.c +2 -2
@@ -1186,7 +1186,7 @@ static void complete_scsi_command(struct CommandList *cp)"has check condition: aborted command: " "ASC: 0x%x, ASCQ: 0x%x\n" , cp, asc, ascq); - cmd->result =DID_SOFT_ERROR <<16 ; + cmd->result |=DID_SOFT_ERROR <<16 ;break ; }/* Must be some other type of check condition */
@@ -4465,7 +4465,7 @@ reinit_after_soft_reset:hpsa_hba_inquiry (h);hpsa_register_scsi (h);/* hook ourselves into SCSI subsystem */ start_controller_lockup_detector (h); -return 1 ; +return 0 ; clean4:hpsa_free_sg_chain_blocks (h);
drivers/scsi/libsas/sas_ata.c +1 -1
@@ -197,7 +197,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) qc->tf.nsect =0 ; } -ata_tf_to_fis (&qc->tf,1 ,0 , (u8 *)&task->ata_task.fis); +ata_tf_to_fis (&qc->tf, qc->dev->link->pmp,1 , (u8 *)&task->ata_task.fis); task->uldd_task = qc;if (ata_is_atapi (qc->tf.protocol)) {memcpy (task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
drivers/staging/tidspbridge/Kconfig +1 -1
@@ -4,7 +4,7 @@ menuconfig TIDSPBRIDGE tristate "DSP Bridge driver" - depends on ARCH_OMAP3 + depends on ARCH_OMAP3 && BROKEN select OMAP_MBOX_FWK help DSP/BIOS Bridge is designed for platforms that contain a GPP and
drivers/staging/zram/zram_sysfs.c +18 -7
@@ -95,20 +95,27 @@ static ssize_t reset_store(struct device *dev, zram =dev_to_zram (dev); bdev =bdget_disk (zram->disk,0 ); +if (!bdev) +return -ENOMEM ; +/* Do not reset an active device! */ -if (bdev->bd_holders) -return -EBUSY ; +if (bdev->bd_holders) { + ret = -EBUSY ; + goto out; + } ret =strict_strtoul (buf,10 , &do_reset);if (ret) -return ret; + goto out; -if (!do_reset) -return -EINVAL ; +if (!do_reset) { + ret = -EINVAL ; + goto out; + }/* Make sure all pending I/O is finished */ -if (bdev) -fsync_bdev (bdev); +fsync_bdev (bdev); +bdput (bdev);down_write (&zram->init_lock);if (zram->init_done)
@@ -116,6 +123,10 @@ static ssize_t reset_store(struct device *dev,up_write (&zram->init_lock);return len; + +out: +bdput (bdev); +return ret; } static ssize_t num_reads_show(struct device *dev,
drivers/target/iscsi/iscsi_target_auth.c +4 -1
@@ -172,6 +172,7 @@ static int chap_server_compute_md5(unsigned char client_digest[MD5_SIGNATURE_SIZE ];unsigned char server_digest[MD5_SIGNATURE_SIZE ];unsigned char chap_n[MAX_CHAP_N_SIZE ], chap_r[MAX_RESPONSE_LENGTH ]; +size_t compare_len;struct iscsi_chap *chap = (struct iscsi_chap *) conn->auth_protocol;struct crypto_hash *tfm;struct hash_desc desc;
@@ -210,7 +211,9 @@ static int chap_server_compute_md5( goto out; } -if (memcmp (chap_n, auth->userid,strlen (auth->userid)) !=0 ) { +/* Include the terminating NULL in the compare */ + compare_len =strlen (auth->userid) +1 ; +if (strncmp (chap_n, auth->userid, compare_len) !=0 ) {pr_err ("CHAP_N values do not match!\n" ); goto out; }
drivers/target/iscsi/iscsi_target_nego.c +1 -1
@@ -89,7 +89,7 @@ int extract_param(if (len <0 )return -1 ; -if (len > max_length) { +if (len >= max_length) {pr_err ("Length of input: %d exeeds max_length:" " %d\n" , len, max_length);return -1 ;
drivers/usb/class/cdc-acm.c +2 -0
@@ -1448,6 +1448,8 @@ static int acm_reset_resume(struct usb_interface *intf)static const struct usb_device_id acm_ids[] = {/* quirky and broken devices */ + {USB_DEVICE (0x17ef ,0x7000 ),/* Lenovo USB modem */ + .driver_info =NO_UNION_NORMAL , },/* has no union descriptor */ {USB_DEVICE (0x0870 ,0x0001 ),/* Metricom GS Modem */ .driver_info =NO_UNION_NORMAL ,/* has no union descriptor */ },
drivers/usb/core/hub.c +14 -2
@@ -900,6 +900,11 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)clear_port_feature (hub->hdev, port1,USB_PORT_FEAT_C_PORT_LINK_STATE ); } +if (portchange &USB_PORT_STAT_C_RESET ) { + need_debounce_delay = true; +clear_port_feature (hub->hdev, port1, +USB_PORT_FEAT_C_RESET ); + }if ((portchange &USB_PORT_STAT_C_BH_RESET ) &&hub_is_superspeed (hub->hdev)) {
@@ -3749,8 +3754,9 @@ static void hub_events(void) hub->hdev->children[i -1 ];dev_dbg (hub_dev,"warm reset port %d\n" , i); -if (!udev || !(portstatus & -USB_PORT_STAT_CONNECTION )) { +if (!udev || + !(portstatus &USB_PORT_STAT_CONNECTION ) || + udev->state ==USB_STATE_NOTATTACHED ) { status =hub_port_reset (hub, i,NULL ,HUB_BH_RESET_TIME , true);
@@ -4018,6 +4024,12 @@ static int usb_reset_and_verify_device(struct usb_device *udev) } parent_hub =hdev_to_hub (parent_hdev); +/* Disable USB2 hardware LPM. +* It will be re-enabled by the enumeration process. +*/ +if (udev->usb2_hw_lpm_enabled ==1 ) +usb_set_usb2_hardware_lpm (udev,0 ); +set_bit (port1, parent_hub->busy_bits);for (i =0 ; i <SET_CONFIG_TRIES ; ++i) {
drivers/usb/dwc3/ep0.c +2 -0
@@ -394,6 +394,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, dep =dwc3_wIndex_to_dep (dwc, ctrl->wIndex);if (!dep)return -EINVAL ; +if (set ==0 && (dep->flags &DWC3_EP_WEDGE )) +break ; ret =__dwc3_gadget_ep_set_halt (dep, set);if (ret)return -EINVAL ;
drivers/usb/dwc3/gadget.c +1 -4
@@ -903,9 +903,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)else dep->flags |=DWC3_EP_STALL ; }else { -if (dep->flags &DWC3_EP_WEDGE ) -return 0 ; - ret =dwc3_send_gadget_ep_cmd (dwc, dep->number,DWC3_DEPCMD_CLEARSTALL , ¶ms);if (ret)
@@ -913,7 +910,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) value ?"set" :"clear" , dep->name); else - dep->flags &= ~DWC3_EP_STALL; + dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE); }return ret;
drivers/usb/gadget/composite.c +1 -0
@@ -585,6 +585,7 @@ static void reset_config(struct usb_composite_dev *cdev)bitmap_zero (f->endpoints,32 ); } cdev->config =NULL ; + cdev->delayed_status =0 ; } static int set_config(struct usb_composite_dev *cdev,
drivers/usb/serial/ftdi_sio.c +24 -7
@@ -2192,6 +2192,20 @@ static void ftdi_set_termios(struct tty_struct *tty, termios->c_cflag |=CRTSCTS ; } +/* +* All FTDI UART chips are limited to CS7/8. We won't pretend to +* support CS5/6 and revert the CSIZE setting instead. +*/ +if ((C_CSIZE (tty) !=CS8 ) && (C_CSIZE (tty) !=CS7 )) { +dev_warn (&port->dev,"requested CSIZE setting not supported\n" ); + + termios->c_cflag &= ~CSIZE ; +if (old_termios) + termios->c_cflag |= old_termios->c_cflag &CSIZE ; +else + termios->c_cflag |=CS8 ; + } + cflag = termios->c_cflag;if (!old_termios)
@@ -2228,13 +2242,16 @@ no_skip: }else { urb_value |=FTDI_SIO_SET_DATA_PARITY_NONE ; } -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS7 : urb_value |=7 ;dbg ("Setting CS7" );break ; -case CS8 : urb_value |=8 ;dbg ("Setting CS8" );break ; -default : -dev_err (&port->dev,"CSIZE was set but not CS7-CS8\n" ); - } +switch (cflag &CSIZE ) { +case CS7 : + urb_value |=7 ; +dev_dbg (&port->dev,"Setting CS7\n" ); +break ; +default : +case CS8 : + urb_value |=8 ; +dev_dbg (&port->dev,"Setting CS8\n" ); +break ; }/* This is needed by the break command since it uses the same command
drivers/usb/serial/generic.c +1 -8
@@ -228,14 +228,7 @@ retry:return result; } -/* Try sending off another urb, unless in irq context (in which case -* there will be no free urb). */ -if (!in_irq ()) - goto retry; - -clear_bit_unlock (USB_SERIAL_WRITE_BUSY , &port->flags); - -return 0 ; + goto retry;/* try sending off another urb */ }/**
drivers/usb/serial/mos7840.c +20 -16
@@ -1689,7 +1689,11 @@ static int mos7840_tiocmget(struct tty_struct *tty)return -ENODEV ; status =mos7840_get_uart_reg (port,MODEM_STATUS_REGISTER , &msr); +if (status !=1 ) +return -EIO ; status =mos7840_get_uart_reg (port,MODEM_CONTROL_REGISTER , &mcr); +if (status !=1 ) +return -EIO ; result = ((mcr &MCR_DTR ) ?TIOCM_DTR :0 ) | ((mcr &MCR_RTS ) ?TIOCM_RTS :0 ) | ((mcr &MCR_LOOPBACK ) ?TIOCM_LOOP :0 )
@@ -1983,25 +1987,25 @@ static void mos7840_change_port_settings(struct tty_struct *tty, iflag = tty->termios->c_iflag;/* Change the number of bits */ -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS5 : - lData =LCR_BITS_5 ; -break ; +switch (cflag &CSIZE ) { +case CS5 : + lData =LCR_BITS_5 ; +break ; -case CS6 : - lData =LCR_BITS_6 ; -break ; +case CS6 : + lData =LCR_BITS_6 ; +break ; -case CS7 : - lData =LCR_BITS_7 ; -break ; -default : -case CS8 : - lData =LCR_BITS_8 ; -break ; - } +case CS7 : + lData =LCR_BITS_7 ; +break ; + +default : +case CS8 : + lData =LCR_BITS_8 ; +break ; } +/* Change the Parity bit */ if (cflag &PARENB ) {if (cflag &PARODD ) {
drivers/usb/serial/option.c +44 -0
98 lines not on this page · raw message
drivers/usb/serial/pl2303.c +14 -17
@@ -290,24 +290,21 @@ static void pl2303_set_termios(struct tty_struct *tty,dbg ("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x" , i, buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ]); -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS5 : - buf[6 ] =5 ; -break ; -case CS6 : - buf[6 ] =6 ; -break ; -case CS7 : - buf[6 ] =7 ; -break ; -default : -case CS8 : - buf[6 ] =8 ; -break ; - } -dbg ("%s - data bits = %d" , __func__, buf[6 ]); +switch (C_CSIZE (tty)) { +case CS5 : + buf[6 ] =5 ; +break ; +case CS6 : + buf[6 ] =6 ; +break ; +case CS7 : + buf[6 ] =7 ; +break ; +default : +case CS8 : + buf[6 ] =8 ; } +dev_dbg (&port->dev,"data bits = %d\n" , buf[6 ]);/* For reference buf[0]:buf[3] baud rate value */ /* NOTE: Only the values defined in baud_sup are supported !
drivers/usb/serial/spcp8x5.c +14 -16
@@ -394,22 +394,20 @@ static void spcp8x5_set_termios(struct tty_struct *tty, }/* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */ -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS5 : - buf[1 ] |=SET_UART_FORMAT_SIZE_5 ; -break ;
Lines of this file are not shown. View the raw message.
fs/nfsd/vfs.c +99 -74
173 lines not on this page · raw message
kernel/trace/ftrace.c +111 -53
164 lines not on this page · raw message
net/packet/af_packet.c +54 -42
96 lines not on this page · raw message
security/selinux/hooks.c +76 -17
93 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 11 lines · Ben Hutchings
This is the start of the stable review cycle for the 3.2.54 release. There are 185 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Jan 1 00:00:00 UTC 2014. Anything received after that time might be too late.
A combined patch relative to 3.2.53 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Build results:
total: 100 pass: 78 skipped: 14 fail: 8
qemu tests all pass.
Results are as expected.
Guenter
Quoted 12 lines · Guenter Roeck
Quoted 11 lines · Ben Hutchings
This is the start of the stable review cycle for the 3.2.54 release. There are 185 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Jan 1 00:00:00 UTC 2014. Anything received after that time might be too late.
A combined patch relative to 3.2.53 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Quoted 6 lines
Build results:
total: 100 pass: 78 skipped: 14 fail: 8qemu tests all pass.
Results are as expected.
Thanks for checking.
Ben.
Signature · 3 lines
Ben Hutchings
Klipstein's 4th Law of Prototyping and Production:
A fail-safe circuit will destroy others.