diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-01 01:16:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-01 01:16:13 +0300 |
| commit | 2cfa1cd3da14814a1e9ec6a4fce8612637d3ee3d (patch) | |
| tree | a3d5f2dcb3fd5db19e48fe9c7e0b7c96db8c1f72 /security/selinux/include | |
| parent | 3dbc4f548519f9882676843b4fcdb4e61668baf8 (diff) | |
| parent | 4b14752ec4e0d87126e636384cf37c8dd9df157c (diff) | |
| download | linux-2cfa1cd3da14814a1e9ec6a4fce8612637d3ee3d.tar.xz | |
Merge tag 'selinux-pr-20180130' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull selinux updates from Paul Moore:
"A small pull request this time, just three patches, and one of these
is just a comment update (swap the FSF physical address for a URL).
The other two patches are small bug fixes found by szybot/syzkaller;
they individual patch descriptions should tell you all you ever wanted
to know"
* tag 'selinux-pr-20180130' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
selinux: skip bounded transition processing if the policy isn't loaded
selinux: ensure the context is NUL terminated in security_context_to_sid_core()
security: replace FSF address with web source in license notices
Diffstat (limited to 'security/selinux/include')
| -rw-r--r-- | security/selinux/include/netlabel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/include/netlabel.h b/security/selinux/include/netlabel.h index 75686d53df07..e77a5e307955 100644 --- a/security/selinux/include/netlabel.h +++ b/security/selinux/include/netlabel.h @@ -19,8 +19,7 @@ * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ |