Skip to content

Commit b6476b9

Browse files
nathanchancenathanchance
authored
Merge pull request #745 from nathanchance/update-patches-apr-25-2024
2 parents 7e3167d + 0ab366d commit b6476b9

13 files changed

+28
-215
lines changed

‎patches/6.1/7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch renamed to ‎patches/6.1/9bf4e919ccad613b3596eebf1ff37b05b6405307.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7d80e7ebf9e333dc5463a48a914f55caef15f62f Mon Sep 17 00:00:00 2001
1+
From 9bf4e919ccad613b3596eebf1ff37b05b6405307 Mon Sep 17 00:00:00 2001
22
From: Nathan Chancellor <[email protected]>
33
Date: Mon, 1 Apr 2024 11:24:17 -0700
44
Subject: Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
@@ -62,7 +62,7 @@ Signed-off-by: Luiz Augusto von Dentz <[email protected]>
6262
2 files changed, 8 insertions(+), 6 deletions(-)
6363

6464
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
65-
index 9a9f933a748b8..7846a068bf60b 100644
65+
index e7d810b23082f5..5cc83f906c123f 100644
6666
--- a/net/bluetooth/l2cap_sock.c
6767
+++ b/net/bluetooth/l2cap_sock.c
6868
@@ -439,7 +439,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
@@ -94,10 +94,10 @@ index 9a9f933a748b8..7846a068bf60b 100644
9494
err = -EFAULT;
9595

9696
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
97-
index b3c2af7c7d678..99c2b713d8268 100644
97+
index 368e026f4d15ca..5d03c5440b06f8 100644
9898
--- a/net/bluetooth/sco.c
9999
+++ b/net/bluetooth/sco.c
100-
@@ -982,7 +982,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
100+
@@ -964,7 +964,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
101101
struct sock *sk = sock->sk;
102102
struct sco_options opts;
103103
struct sco_conninfo cinfo;
@@ -107,7 +107,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
107107

108108
BT_DBG("sk %p", sk);
109109

110-
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
110+
@@ -986,7 +987,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
111111

112112
BT_DBG("mtu %u", opts.mtu);
113113

@@ -116,7 +116,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
116116
if (copy_to_user(optval, (char *)&opts, len))
117117
err = -EFAULT;
118118

119-
@@ -1022,7 +1023,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
119+
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
120120
cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
121121
memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
122122

‎patches/6.1/series

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch
1+
9bf4e919ccad613b3596eebf1ff37b05b6405307.patch

‎patches/6.6/7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch renamed to ‎patches/6.6/9bf4e919ccad613b3596eebf1ff37b05b6405307.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7d80e7ebf9e333dc5463a48a914f55caef15f62f Mon Sep 17 00:00:00 2001
1+
From 9bf4e919ccad613b3596eebf1ff37b05b6405307 Mon Sep 17 00:00:00 2001
22
From: Nathan Chancellor <[email protected]>
33
Date: Mon, 1 Apr 2024 11:24:17 -0700
44
Subject: Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
@@ -62,7 +62,7 @@ Signed-off-by: Luiz Augusto von Dentz <[email protected]>
6262
2 files changed, 8 insertions(+), 6 deletions(-)
6363

6464
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
65-
index 9a9f933a748b8..7846a068bf60b 100644
65+
index e7d810b23082f5..5cc83f906c123f 100644
6666
--- a/net/bluetooth/l2cap_sock.c
6767
+++ b/net/bluetooth/l2cap_sock.c
6868
@@ -439,7 +439,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
@@ -94,10 +94,10 @@ index 9a9f933a748b8..7846a068bf60b 100644
9494
err = -EFAULT;
9595

9696
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
97-
index b3c2af7c7d678..99c2b713d8268 100644
97+
index 368e026f4d15ca..5d03c5440b06f8 100644
9898
--- a/net/bluetooth/sco.c
9999
+++ b/net/bluetooth/sco.c
100-
@@ -982,7 +982,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
100+
@@ -964,7 +964,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
101101
struct sock *sk = sock->sk;
102102
struct sco_options opts;
103103
struct sco_conninfo cinfo;
@@ -107,7 +107,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
107107

108108
BT_DBG("sk %p", sk);
109109

110-
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
110+
@@ -986,7 +987,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
111111

112112
BT_DBG("mtu %u", opts.mtu);
113113

@@ -116,7 +116,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
116116
if (copy_to_user(optval, (char *)&opts, len))
117117
err = -EFAULT;
118118

119-
@@ -1022,7 +1023,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
119+
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
120120
cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
121121
memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
122122

‎patches/6.6/series

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch
1+
9bf4e919ccad613b3596eebf1ff37b05b6405307.patch
22
v2_20240305_nathan_media_mxl5xx_move_xpt_structures_off_stack.patch

‎patches/mainline/series

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch
21
v2_20240305_nathan_media_mxl5xx_move_xpt_structures_off_stack.patch
3-
workaround-cbl-2014.patch

‎patches/mainline/workaround-cbl-2014.patch

-27
This file was deleted.

‎patches/next/series

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
v2_20240305_nathan_media_mxl5xx_move_xpt_structures_off_stack.patch
2-
workaround-cbl-2014.patch

‎patches/next/workaround-cbl-2014.patch

-27
This file was deleted.

‎patches/mainline/7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch renamed to ‎patches/stable/9bf4e919ccad613b3596eebf1ff37b05b6405307.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7d80e7ebf9e333dc5463a48a914f55caef15f62f Mon Sep 17 00:00:00 2001
1+
From 9bf4e919ccad613b3596eebf1ff37b05b6405307 Mon Sep 17 00:00:00 2001
22
From: Nathan Chancellor <[email protected]>
33
Date: Mon, 1 Apr 2024 11:24:17 -0700
44
Subject: Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
@@ -62,7 +62,7 @@ Signed-off-by: Luiz Augusto von Dentz <[email protected]>
6262
2 files changed, 8 insertions(+), 6 deletions(-)
6363

6464
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
65-
index 9a9f933a748b8..7846a068bf60b 100644
65+
index e7d810b23082f5..5cc83f906c123f 100644
6666
--- a/net/bluetooth/l2cap_sock.c
6767
+++ b/net/bluetooth/l2cap_sock.c
6868
@@ -439,7 +439,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
@@ -94,10 +94,10 @@ index 9a9f933a748b8..7846a068bf60b 100644
9494
err = -EFAULT;
9595

9696
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
97-
index b3c2af7c7d678..99c2b713d8268 100644
97+
index 368e026f4d15ca..5d03c5440b06f8 100644
9898
--- a/net/bluetooth/sco.c
9999
+++ b/net/bluetooth/sco.c
100-
@@ -982,7 +982,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
100+
@@ -964,7 +964,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
101101
struct sock *sk = sock->sk;
102102
struct sco_options opts;
103103
struct sco_conninfo cinfo;
@@ -107,7 +107,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
107107

108108
BT_DBG("sk %p", sk);
109109

110-
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
110+
@@ -986,7 +987,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
111111

112112
BT_DBG("mtu %u", opts.mtu);
113113

@@ -116,7 +116,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
116116
if (copy_to_user(optval, (char *)&opts, len))
117117
err = -EFAULT;
118118

119-
@@ -1022,7 +1023,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
119+
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
120120
cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
121121
memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
122122

‎patches/stable/series

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch
1+
9bf4e919ccad613b3596eebf1ff37b05b6405307.patch
22
v2_20240305_nathan_media_mxl5xx_move_xpt_structures_off_stack.patch

‎patches/tip/7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch

-130
This file was deleted.

‎patches/stable/7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch renamed to ‎patches/tip/9bf4e919ccad613b3596eebf1ff37b05b6405307.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7d80e7ebf9e333dc5463a48a914f55caef15f62f Mon Sep 17 00:00:00 2001
1+
From 9bf4e919ccad613b3596eebf1ff37b05b6405307 Mon Sep 17 00:00:00 2001
22
From: Nathan Chancellor <[email protected]>
33
Date: Mon, 1 Apr 2024 11:24:17 -0700
44
Subject: Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
@@ -62,7 +62,7 @@ Signed-off-by: Luiz Augusto von Dentz <[email protected]>
6262
2 files changed, 8 insertions(+), 6 deletions(-)
6363

6464
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
65-
index 9a9f933a748b8..7846a068bf60b 100644
65+
index e7d810b23082f5..5cc83f906c123f 100644
6666
--- a/net/bluetooth/l2cap_sock.c
6767
+++ b/net/bluetooth/l2cap_sock.c
6868
@@ -439,7 +439,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
@@ -94,10 +94,10 @@ index 9a9f933a748b8..7846a068bf60b 100644
9494
err = -EFAULT;
9595

9696
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
97-
index b3c2af7c7d678..99c2b713d8268 100644
97+
index 368e026f4d15ca..5d03c5440b06f8 100644
9898
--- a/net/bluetooth/sco.c
9999
+++ b/net/bluetooth/sco.c
100-
@@ -982,7 +982,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
100+
@@ -964,7 +964,8 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
101101
struct sock *sk = sock->sk;
102102
struct sco_options opts;
103103
struct sco_conninfo cinfo;
@@ -107,7 +107,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
107107

108108
BT_DBG("sk %p", sk);
109109

110-
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
110+
@@ -986,7 +987,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
111111

112112
BT_DBG("mtu %u", opts.mtu);
113113

@@ -116,7 +116,7 @@ index b3c2af7c7d678..99c2b713d8268 100644
116116
if (copy_to_user(optval, (char *)&opts, len))
117117
err = -EFAULT;
118118

119-
@@ -1022,7 +1023,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
119+
@@ -1004,7 +1005,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
120120
cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
121121
memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
122122

‎patches/tip/series

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7d80e7ebf9e333dc5463a48a914f55caef15f62f.patch
1+
9bf4e919ccad613b3596eebf1ff37b05b6405307.patch

0 commit comments

Comments
 (0)