Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 20c6aaa39ab735c7ed78e4e5a214d250efae0a6e

Authored by zhangxiliang
Committed by Al Viro
1 parent 980dfb0db3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] Fix the bug of using AUDIT_STATUS_RATE_LIMIT when set fail, no error output. 

When the "status_get->mask" is "AUDIT_STATUS_RATE_LIMIT || AUDIT_STATUS_BACKLOG_LIMIT".
If "audit_set_rate_limit" fails and "audit_set_backlog_limit" succeeds, the "err" value
will be greater than or equal to 0. It will miss the failure of rate set.

Signed-off-by: Zhang Xiliang <zhangxiliang@cn.fujitsu.com>
Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 8 additions and 3 deletions Side-by-side Diff

... ... @@ -707,12 +707,14 @@
707 707 if (status_get->mask & AUDIT_STATUS_ENABLED) {
708 708 err = audit_set_enabled(status_get->enabled,
709 709 loginuid, sessionid, sid);
710   - if (err < 0) return err;
  710 + if (err < 0)
  711 + return err;
711 712 }
712 713 if (status_get->mask & AUDIT_STATUS_FAILURE) {
713 714 err = audit_set_failure(status_get->failure,
714 715 loginuid, sessionid, sid);
715   - if (err < 0) return err;
  716 + if (err < 0)
  717 + return err;
716 718 }
717 719 if (status_get->mask & AUDIT_STATUS_PID) {
718 720 int new_pid = status_get->pid;
719 721  
... ... @@ -725,9 +727,12 @@
725 727 audit_pid = new_pid;
726 728 audit_nlk_pid = NETLINK_CB(skb).pid;
727 729 }
728   - if (status_get->mask & AUDIT_STATUS_RATE_LIMIT)
  730 + if (status_get->mask & AUDIT_STATUS_RATE_LIMIT) {
729 731 err = audit_set_rate_limit(status_get->rate_limit,
730 732 loginuid, sessionid, sid);
  733 + if (err < 0)
  734 + return err;
  735 + }
731 736 if (status_get->mask & AUDIT_STATUS_BACKLOG_LIMIT)
732 737 err = audit_set_backlog_limit(status_get->backlog_limit,
733 738 loginuid, sessionid, sid);