[PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Tyler Hicks-2
BugLink: https://launchpad.net/bugs/1772671

Only print a single newline between the "Seccomp" and
"Speculation_Store_Bypass" lines in /proc/PID/status files.

Signed-off-by: Tyler Hicks <[hidden email]>
---

This bug only affected the Xenial 4.4 based kernels.

 fs/proc/array.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 8930b068199d..93c664097cb9 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -334,7 +334,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
 #ifdef CONFIG_SECCOMP
  seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
 #endif
- seq_printf(m, "\nSpeculation_Store_Bypass:\t");
+ seq_printf(m, "Speculation_Store_Bypass:\t");
  switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
  case -EINVAL:
  seq_printf(m, "unknown");
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Stefan Bader-2
On 24.05.2018 06:44, Tyler Hicks wrote:
> BugLink: https://launchpad.net/bugs/1772671
>
> Only print a single newline between the "Seccomp" and
> "Speculation_Store_Bypass" lines in /proc/PID/status files.
>
> Signed-off-by: Tyler Hicks <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>
> This bug only affected the Xenial 4.4 based kernels.
>
>  fs/proc/array.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index 8930b068199d..93c664097cb9 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -334,7 +334,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
>  #ifdef CONFIG_SECCOMP
>   seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
>  #endif
> - seq_printf(m, "\nSpeculation_Store_Bypass:\t");
> + seq_printf(m, "Speculation_Store_Bypass:\t");
>   switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
>   case -EINVAL:
>   seq_printf(m, "unknown");
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Khaled Elmously
In reply to this post by Tyler Hicks-2
On 2018-05-24 13:44:25 , Tyler Hicks wrote:
> BugLink: https://launchpad.net/bugs/1772671
>
> Only print a single newline between the "Seccomp" and
> "Speculation_Store_Bypass" lines in /proc/PID/status files.

Does this still have the right amount of newlines if CONFIG_SECCOMP isn't defined?



>
> Signed-off-by: Tyler Hicks <[hidden email]>
> ---
>
> This bug only affected the Xenial 4.4 based kernels.
>
>  fs/proc/array.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index 8930b068199d..93c664097cb9 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -334,7 +334,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
>  #ifdef CONFIG_SECCOMP
>   seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
>  #endif
> - seq_printf(m, "\nSpeculation_Store_Bypass:\t");
> + seq_printf(m, "Speculation_Store_Bypass:\t");
>   switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
>   case -EINVAL:
>   seq_printf(m, "unknown");
> --
> 2.7.4
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Stefan Bader-2
On 04.06.2018 15:15, Khaled Elmously wrote:
> On 2018-05-24 13:44:25 , Tyler Hicks wrote:
>> BugLink: https://launchpad.net/bugs/1772671
>>
>> Only print a single newline between the "Seccomp" and
>> "Speculation_Store_Bypass" lines in /proc/PID/status files.
>
> Does this still have the right amount of newlines if CONFIG_SECCOMP isn't defined?

Its not visible in the context of the patch but from memory this was caused by
upstream having changed the whole output into a form that each line did not have
a newline at the end but at the beginning.
So when backporting one needed to take the leading newline away because there
each element added it at the end.

-Stefan

>
>
>
>>
>> Signed-off-by: Tyler Hicks <[hidden email]>
>> ---
>>
>> This bug only affected the Xenial 4.4 based kernels.
>>
>>  fs/proc/array.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/proc/array.c b/fs/proc/array.c
>> index 8930b068199d..93c664097cb9 100644
>> --- a/fs/proc/array.c
>> +++ b/fs/proc/array.c
>> @@ -334,7 +334,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
>>  #ifdef CONFIG_SECCOMP
>>   seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
>>  #endif
>> - seq_printf(m, "\nSpeculation_Store_Bypass:\t");
>> + seq_printf(m, "Speculation_Store_Bypass:\t");
>>   switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
>>   case -EINVAL:
>>   seq_printf(m, "unknown");
>> --
>> 2.7.4
>>
>>
>> --
>> kernel-team mailing list
>> [hidden email]
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Tyler Hicks-2
In reply to this post by Khaled Elmously
On 06/04/2018 05:15 PM, Khaled Elmously wrote:
> On 2018-05-24 13:44:25 , Tyler Hicks wrote:
>> BugLink: https://launchpad.net/bugs/1772671
>>
>> Only print a single newline between the "Seccomp" and
>> "Speculation_Store_Bypass" lines in /proc/PID/status files.
>
> Does this still have the right amount of newlines if CONFIG_SECCOMP isn't defined?

Yes, a double newline sequence was being printed with or without
CONFIG_SECCOMP.

Tyler

>
>
>
>>
>> Signed-off-by: Tyler Hicks <[hidden email]>
>> ---
>>
>> This bug only affected the Xenial 4.4 based kernels.
>>
>>  fs/proc/array.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/proc/array.c b/fs/proc/array.c
>> index 8930b068199d..93c664097cb9 100644
>> --- a/fs/proc/array.c
>> +++ b/fs/proc/array.c
>> @@ -334,7 +334,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
>>  #ifdef CONFIG_SECCOMP
>>   seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
>>  #endif
>> - seq_printf(m, "\nSpeculation_Store_Bypass:\t");
>> + seq_printf(m, "Speculation_Store_Bypass:\t");
>>   switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
>>   case -EINVAL:
>>   seq_printf(m, "unknown");
>> --
>> 2.7.4
>>
>>
>> --
>> kernel-team mailing list
>> [hidden email]
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

ACK/APPLIED: [PATCH][SRU][X] UBUNTU: SAUCE: seccomp: Remove double newline sequence in /proc/PID/status

Juerg Haefliger
In reply to this post by Tyler Hicks-2
On 05/24/2018 03:44 PM, Tyler Hicks wrote:
> BugLink: https://launchpad.net/bugs/1772671
>
> Only print a single newline between the "Seccomp" and
> "Speculation_Store_Bypass" lines in /proc/PID/status files.
>
> Signed-off-by: Tyler Hicks <[hidden email]>

Acked-by: Juerg Haefliger <[hidden email]>

Applied to xenial/master-next.

...Juerg


> ---
>
> This bug only affected the Xenial 4.4 based kernels.
>
>  fs/proc/array.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index 8930b068199d..93c664097cb9 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -334,7 +334,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
>  #ifdef CONFIG_SECCOMP
>   seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
>  #endif
> - seq_printf(m, "\nSpeculation_Store_Bypass:\t");
> + seq_printf(m, "Speculation_Store_Bypass:\t");
>   switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
>   case -EINVAL:
>   seq_printf(m, "unknown");
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment