Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit 911883759fed56c32b97d73154039b5f8ffcba93

Authored by Linus Torvalds
2 parents 5a7a662cc6 799b601451
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit 

Pull audit fixes from Paul Moore:
 "After he sent the initial audit pull request for 3.18, Eric asked me
  to take over the management of the audit tree, hence this pull request
  to fix a couple of problems with audit.

  As you can see below, the changes are minimal: adding some whitespace
  to a string so userspace parses it correctly, and fixing a problem
  with audit's usage of fsnotify that was causing audit watch rules to
  be lost.  Neither of these patches were very controversial on the
  mailing lists and they fix real problems, getting them into 3.18 would
  be a good thing"

* 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit:
  audit: keep inode pinned
  audit: AUDIT_FEATURE_CHANGE message format missing delimiting space

Showing 2 changed files Side-by-side Diff

... ... @@ -739,7 +739,7 @@
739 739  
740 740 ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE);
741 741 audit_log_task_info(ab, current);
742   - audit_log_format(ab, "feature=%s old=%u new=%u old_lock=%u new_lock=%u res=%d",
  742 + audit_log_format(ab, " feature=%s old=%u new=%u old_lock=%u new_lock=%u res=%d",
743 743 audit_feature_names[which], !!old_feature, !!new_feature,
744 744 !!old_lock, !!new_lock, res);
745 745 audit_log_end(ab);
... ... @@ -154,6 +154,7 @@
154 154 chunk->owners[i].index = i;
155 155 }
156 156 fsnotify_init_mark(&chunk->mark, audit_tree_destroy_watch);
  157 + chunk->mark.mask = FS_IN_IGNORED;
157 158 return chunk;
158 159 }
159 160